Edit redo
Work in progress on edit
changed edit functionality. Workin on making a modal for adding users #1
Merge branch 'master' into edit-redo

Conflicts:
	public/javascripts/global.js
	views/index.jade
Merge branch 'edit-redo'

Conflicts:
	views/index.jade