sync
Merge branch 'master' of https://github.com/NullEmpire/dirtlunch

Conflicts:
	views/index.jade
sync
Merge branch 'master' of https://github.com/NullEmpire/dirtlunch