Merge pull request #27 from Fitzclutchington/master

register bootstrap
modify addclass template to with class
minor edit in return value render to template on authenticateUser()
Merge pull request #28 from mk200789/master

modify addclass.html to populate with list of class, and views.py
Merge pull request #29 from Fitzclutchington/master

bootstrap for register
Merge pull request #30 from Fitzclutchington/master

updated requirements.txt
Added modal form to add numbers, no functionality yet
Fixed merge conflicts
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/app/urls.py
	app/hack/forms.pyc
	app/hack/templates/base.html
Merge pull request #31 from lsxliron/master

Added modal form to add numbers, no functionality yet
Purging all .pyc files
.gitignore: Updating .gitignore to ignore all .pyc files
slight modification on style
Merge pull request #32 from mk200789/master

slight modification on style
register.html: Centering registration form
Merge branch 'master' of https://github.com/DrkSephy/lehman-hackathon
register.html: Updating register.html button
updated sign in
Can add numbers and emails of students
fixing merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/hack/send_email.pyc
	app/hack/send_sms.pyc