Creep updates, etc
Conflict Resolution
I said, conflict RES
Final Conflict res
File deletion
Foo
	modified:   src/edu/moravian/Ball.java
	modified:   src/edu/moravian/TowerDefenseGame.java
	modified:   src/edu/moravian/WorldMap/MapBuilder.java
	modified:   src/edu/moravian/WorldMap/WorldMap.java
	new file:   src/edu/moravian/creep/BasicStupidCreep.java
	modified:   src/edu/moravian/creep/Creep.java
	new file:   src/edu/moravian/creep/CreepManager.java
	modified:   src/edu/moravian/creep/Path.java
	modified:   src/edu/moravian/graphics/Drawable.java
	modified:   src/edu/moravian/projectile/BasicBullet.java
	modified:   src/edu/moravian/projectile/Projectile.java
	modified:   src/edu/moravian/Ball.java
	modified:   src/edu/moravian/TowerDefenseGame.java
	modified:   src/edu/moravian/WorldMap/MapBuilder.java
	modified:   src/edu/moravian/WorldMap/WorldMap.java
	deleted:    src/edu/moravian/creep/BasicStupidCreep.java
	modified:   src/edu/moravian/creep/Creep.java
	deleted:    src/edu/moravian/creep/CreepManager.java
	modified:   src/edu/moravian/creep/Path.java
	modified:   src/edu/moravian/graphics/Drawable.java
	modified:   src/edu/moravian/projectile/BasicBullet.java
	modified:   src/edu/moravian/projectile/Projectile.java
Merge branch 'master' of github.com:moorework/GameProgramming