Subject: Initial commit.

Description:

App ready to be deployed on heroku
Merge branch 'master' of https://github.com/psachin/mysite into temp

Conflicts:
	mysite/settings.py