648pm 3/5/2014
814pm 3/5
Set up login using Google Account
439pm 3/7/2014
439pm 3/7/2014
Implemented database model
Moved front end to /main/templates/main, following Django standard
change template to templates
..
Merge branch 'frontend' into deploy

Conflicts:
	main/templates/main/index.html