Merge pull request #28 from mk200789/master

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

bootstrap for register
updated requirements.txt
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