Changed base.html and redirections
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/hack/templates/addclass.html
Merge pull request #36 from lsxliron/master

Changed base.html and redirections