Merge pull request #1 from wirving/Kyle

Testing Commit
Merge pull request #2 from wirving/Kyle

Removing Test Commit
-Created draft of temple level
-Started using the objectMap for displaying the levels
-Started a Light class
Merge branch 'Working' of https://github.com/wirving/Synesthesia into Working
New JOGL version
Fixed minor bug with temple walls
Texture support
Eclipse config files, don't want to lose them
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
I gave that mouse movement code on the website I linked you a try. It's a bit spazzy but it works!
Started messing around with outside level
Statue in temple animates, flies at player, and then takes player to next level when space is pressed
Added animation support for basic objects
Made two types of interactive objects (this doesn't have to be final)
New statue animation
Need to just move on and start that other level for reals
This file wasn't supposed to be here
I left some stuff in here that I wasn't using so I got rid of it
Draft of outside level. Support for generating random textures.
Interacting with sphere changes between two level configurations. Some notes so that I don't forget what I was doing:

-JitteringObjects sometimes go outside their valid ranges
-Find bird models
-Deer rotates under ground in the broken version, maybe it's ok?
-Set up collisions
-Pond STILL looks weird -- fix model AGAIN -- looks better with GL sphere mapping, maybe use this for frozen version?
Changes to temple:
Interact close to the statue and the music changes and statue starts walking at you.
Colliding with statue sends you to next level
Slowed down the animation and statue movement. It still looks bad. I'll make more frames if I have time.
Temple has new mosaic texture behind statue
New statue animation
More objects and textures in outside level, added collision map and exit condition (pond)
Temple start position is still in debug mode
Outside start position isn't set to pond yet
merge stuff