done
Merge branch 'bigboy' of https://github.com/melbourne2991/angular-timesheet into bigboy

Conflicts:
	app/scripts/controllers/main.js
	app/scripts/directives/timesheet.js
fixed when no increment view count provided