Added Aah, Aah's animation, and the following script (although it needs work to "snake" better)
Merge branch 'master' into EDevelopment
Fixed build error
Game can hopefully now run again
First phone build - katelyn
Master build error fix (android sdk)
Changed restart button
Merge branch 'katelyn'

Conflicts:
	OriginalOrigins.git/branches/Origin_V6k.apk
Improved Aah's animation/following script, although I still need to make it so Aah follows Ooh when he jumps
Changed Ooh in all levels after level 1 to darker sprite and animation
small fix related to previous commit
Merge branch 'EDevelopment'

Conflicts:
	OriginalOrigins.git/branches/ProjectSettings/ProjectSettings.asset
I filled in a lot of empty space on level one. Added bushes, the shadows of background trees, and a large foreground tree.
Finalized pause menu (even though I feel like the buttons are a tiny bit too large, but it's a pain to make even the smallest changes)
pause menu added to all non-cutscene levels
Aah and his follow script are updated, still not complete, so isolated on level 5

The game window will look gray due to the pause menu GUITextures. If you need to see the game screen without the gray, you can click the check box next to the pause menu object's name in the inspector
added some sound. Still cant get audio listeners to work when approaching audio sources. Must sleep.
I added more scenery to level 1 and 3. Fixed some of the layers so they lay better (esp in the lab). moved the bulletin board down so you can read the one newspaper better. Added one slide to the death cut scene
Merge remote-tracking branch 'origin/katelyn' into EDevelopment

Conflicts:
	OriginalOrigins.git/branches/Assets/Scenes/Level1.unity
	OriginalOrigins.git/branches/Assets/Scenes/Level3.unity
	OriginalOrigins.git/branches/ProjectSettings/ProjectSettings.asset

Attempt to fix merge conflicts
Working version of EDevelopment and katelyn's branch
project builds and runs perfectly
Merge remote-tracking branch 'origin/develop' into EDevelopment

Conflicts:
	OriginalOrigins.git/branches/ProjectSettings/ProjectSettings.asset

Only conflict was the keystore
Fixed the merge with matt's additions
Switched to eric's working version
Master is now up to date and working properly