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

Conflicts:
	public/css/style.css
	public/index.html