making me commit
Merge branch 'work'

Conflicts:
	bin/.gitignore