Fix indentations and typo
Merge branch 'master' of github.com:smartstudy/smartstudy

Conflicts:
	smartstudy/templates/home/main.html