This reverts commit 59925c40

Merged unittesting_and_views to master since functionality of tests, templates and urls have been completed.

Updated views, urls and tests to include the 12 required templates. Revised part of the story in the functional test.

Added code to create the first unittest and created urls.py in the froyo app, and altered code within settings.py and urls.py in the goodplace folder