git your mom
Output and Input stuff
Merge branch 'master' of https://github.com/dxdisrupt/backend

Conflicts:
	public/javascript/main.js
Mergin output input
Merge branch 'master' of https://github.com/dxdisrupt/backend

Conflicts:
	public/javascript/main.js
	views/index.jade