inital commit
Merge branch 'master' of https://github.com/timcolonel/hourglass

Conflicts:
	.gitignore