Merge branch 'master' of https://github.com/iebaker/game-final-project

Conflicts:
	src/engine/entity/Entity.java
Gitignore now ignores saves
Fixed gitignore issue