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

Conflicts:
	bin/engine/entity/Entity$1.class
	bin/engine/entity/Entity.class
	src/engine/entity/Entity.java