add draft quickly
Merge branch 'master' of github.com:Techwraith/scotch

Conflicts:
	app/views/dashboards/main.html.ejs