Stretch Timer project
Merge branch 'master' of https://github.com/mblakley/StretchTimer

Conflicts:
	.gitignore