Merge branch 'master' of github.com:Gyrocopter/BinPacker2D

Conflicts:
	README.md
Merge branch 'master' of github.com:Gyrocopter/BinPacker2D

Conflicts:
	README.md