try
Merge branch 'master' of github.com:Cmacca/tenk-hours

Conflicts:
	Gemfile.lock