Added base html file
Merge branch 'master' of https://github.com/f-enye/Hacksassins

Conflicts:
	djProj/djProj/settings.pyc