main fel
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013
animation fixx
Merge branch 'sean'