First commit
Merge branch 'master' of https://github.com/sskates1/new_game

merged animations

Conflicts:
	lib/player.rb