Lite temp för consolen
Merge branch 'master' of https://github.com/shoobah/democon

Conflicts:
	views/index.jade