collision detector added
set ground pot size
Enemie Goblin
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
project refactored
javadoc added
project refactored
javadoc added
Merge remote-tracking branch 'origin/master' into ButtonTestsBranch

Conflicts:
	.idea/workspace.xml
	GameDemo-android/GameDemo-android.iml
	GameDemo-desktop/GameDemo-desktop.iml
	GameDemo/GameDemo.iml
Changed .gitignore and deleted workspace.xml
Merge branch 'master' into ButtonTestsBranch

Conflicts:
	.idea/workspace.xml