gitignore file updated
Merge branch 'master' of https://github.com/squashedfrog/timebox

Conflicts:
	.gitignore