removed merges
Stash
small changes
Small changes -- James
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013
small changes to bedroom and main asset files
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013
scene changes on night
My changes plus conflict. DayTime scene messages added.
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013
Added the scene audio loader and various other global music stuff.
Stash my changes
Full changes, merges, now in alpha mode -- Boomer, James
music files
Merge branch 'master' of https://github.com/herman-rogers/IndieSpeedRun2013
Adding the sound I forgot to add for NightScene
alpha build changes
small changes
cats
Added all the day object mangers and stuff.