Added a comment
Merge remote-tracking branch 'origin/master'
nothing
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameEngine/src/com/javagameengine/Game.java
Merge remote-tracking branch 'origin/master'
Added UML diagrams. There are two; one that has all of the classes and
one that is very basic. Some classes still may need to be added to the
basic diagram.