updated sign in
fixing merge
Merge pull request #33 from lsxliron/master

Prof. can add numbers and emails and A SLICE
fixing merges
Merge pull request #34 from Fitzclutchington/master

signin bootstrap
modified to extend base template
Merge pull request #35 from mk200789/master

modified to extend base template
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/hack/templates/addclass.html