Initialized Django Project
Merge remote-tracking branch 'origin/master'
Created basic structure of URL routing. Views will be in the views
directory
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
..
Inserted Django template language
Added template language
Added template language to js
Merge branch 'backend' into deploy

Conflicts:
	main/templates/main/index.html
changed static js to django js
Merge branch 'frontend' into deploy
Incorporated the Virtual Fitting Room page and google login. (Category
list is not working)
Fixed category_list problem