Merge pull request #29 from Fidouda/fidouda

Fidouda
intro + obstacletiles
Arranger animations
Merge pull request #30 from mamio/master

intro + obstacletiles
Merge branch 'master' into fidouda
Merge + Bug fixes