Creating template
Merge branch 'master' of ssh://ilch-timesheets.rhcloud.com/~/git/ilch

Conflicts:
	.openshift/cron/weekly/chronograph
	README.md
	src/main/webapp/index.html
	src/main/webapp/snoop.jsp