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

Conflicts:
	LICENSE
Merge branch 'master' of github.com:pmiddend/physie