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