Testing changes
Testing changes
Merge branch 'master' of https://github.com/mrprowse/dizzydrone.git

Conflicts:
	dizzydrone-android/.classpath
	dizzydrone-desktop/bin/.gitignore
Merge branch 'master' of https://github.com/mrprowse/dizzydrone.git
Added radius to circular game objects
Updated dizzy.collidesWith for circular objects