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

Conflicts:
	public/js/templates/templates.js
	views/index.jade