update bodyctrl
Merge branch 'dev' of https://github.com/antgar/Blackout into dev

Conflicts:
	css/style.css
	index.html
	templates/Body.tpl.html