Fixes for collision
Merge branch 'master' of github.com:pmiddend/physie

Conflicts:
	src/Physie/Main.hs