Merge branch 'master' of https://github.com/mrniaboc/heimdall

Conflicts:
	css/style.css
Merge branch 'master' of https://github.com/mrniaboc/heimdall