Merge pull request #24 from ian-s-mcb/master

Continued work on notify modals
created addClass function to add new class
modify urlpatterns to include addClass
Added navbar to templates
Merge pull request #25 from lsxliron/master

Added navbar to templates
added a template addclass.html
Merge remote-tracking branch 'upstream/master'
Merge pull request #26 from mk200789/master

Modify urls.py, create addClass in views.py, and add template addclass.html
register bootstrap
fixing merge conflicts
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
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