Committing physics update
Merge branch 'master' of https://github.com/melak47/Fishy

Conflicts:
	Fishy/Fishy.vcxproj