added shapefactory and changed in appropriate places
Merge branch 'master' of github.com:roflmaolol/Block-Frog