Merge life and tile collisions
Angularize player
Merge pull request #81 from acjones617/master

Angularize player, begin to merge Romain collision changes