Designing pages.
Merge branch 'master' of https://github.com/sahilshekhawat/hackathonv2

Conflicts:
	app/models.pyc
	app/views.pyc
	urls.pyc