Initial commit
Merge branch 'job-count'

Conflicts:
	public/css/style.css
merge