home.html

basic UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/home.html
Merge branch 'master' of https://github.com/NEricN/enhack