Layout changes
Merge branch 'master' of https://github.com/FelixBl/Hearthstonerino

Conflicts:
	views/index.jade
Merge Layout fix