some big ass changes made
Merge branch 'master' of github.com:killbotlogic/killbot-logic-site

Conflicts:
	views/_layout.html