Resolving collisions.
Starting conner enemy.
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git

Conflicts:
	src/plat/enemies/Conner_Enemy.java
	src/plat/interfaces/BlockInterface.java
	src/plat/mainGraphics/Platformer.java
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git

Conflicts:
	src/plat/enemies/Conner_Enemy.java
	src/plat/mainGraphics/Platformer.java
Working on enemy.
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git
Still working on enemy.
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git