Shark animation++
Merge branch 'master' of https://github.com/torgeha/FlapMyFish into tjBranch
Preparing for The Big Merge
whole lot of shit
merged with tjbranch
fiksa player-felt
Merge pull request #18 from torgeha/audun_branch

Audun branch