asdf
Merge branch 'master' of https://github.com/ptsurko/quickstaffing

Conflicts:
	public/js/controllers/indexcontroller.js