Initial commit
Merge branch 'master' of github.com:bsberry/timer

Conflicts:
	.gitignore