Lotta Changes

Added transitioning between levels by pressing p (for testing) or space
at the end game object for the two levels i have mostly working. Added
music functionality, the one song that plays for everything except
transition is just a place holder, although i think i like transitions
music so that might be final. Got the collision detection and maze setup
for the first level. Turn collision detection on and off with o.
one minor edit

just added another temp song for the temple so the one generic song
isn't playing the whole time
Merge branch 'Kyle' into Working
Attempt number 2...

Conflicts:
	.classpath
	bin/BasicObject.class
	bin/CopyOfHierarchical$objModel.class
	bin/CopyOfHierarchical.class
	bin/Hierarchical$objModel.class
	bin/Hierarchical.class
	bin/LevelOne.class
	bin/LevelTwo.class
	bin/Light.class
	bin/Synesthesia$objModel.class
	bin/Synesthesia.class
	bin/Temple.class
	bin/objModel.class
	src/LevelOne.java
	src/Synesthesia.java
	src/Temple.java
	tree_aspen.obj