Updated level 1 audio to have a 4 track loop
Merge pull request #132 from jackykschou/Level1AudioFixes

Updated level 1 audio to have a 4 track loop
Merge pull request #133 from jackykschou/JackySprint11

Jacky sprint11
hacked out 4 clip audio loop fix
Merge branch 'develop' of https://github.com/jackykschou/Capstone2D2014Fall into Level1AudioFixes
Merge pull request #134 from jackykschou/Level1AudioFixes

Level1 audio fixes
Merge pull request #135 from jackykschou/JackySprint11

fixed bugs in webPlayer by not conditionally shifting enums
Merge pull request #136 from jackykschou/JackySprint11

changed webplayer resoluction setting
clean hero combos
Merge branch 'dylanSprint10' into JackySprint11
updated player chacarter animator for new animations