Updates

Updated Settings.  Added Getter and Setter for setFPS in GameEngine.
Merge branch 'master' of https://github.com/Nyrmburk/Physics-Engine

Conflicts:
	src/com/Settings.java