changed views.py and urls.py for faq/tos
Merge branch 'master' of https://github.com/upenu/website
Merge branch 'funny_pictures' of https://github.com/upenu/website into users-models-refactoring
models.py
Merge branch 'funny_pictures' of https://github.com/upenu/website into users-models-refactoring
removed tos from website/urls.py