added stuff to .gitignore
Merge branch 'master' of https://github.com/LochNeffMonster/DinoSwarms
removed extra dinosaur
Fixed movement bug
Merge pull request #33 from Amarcolina/master

A large generation update with an additional update to the tilemap class
merge conflict
fixed array out of bounds error
Merge pull request #34 from jamcohen/master

Combined Terrain and Dinos