Added base.html file
Fixed login
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/hack/views.py
Merge pull request #21 from lsxliron/master

Added base.html file