Reworked jumping + gravity handling.
Committing work so far with implementing inheritance for enemies.
Also changed spawning method and collision detection.
Adding a .gitignore
Updated to properly ignore the generated .xml's
Merge remote-tracking branch 'origin/master' into Spencer-working

Conflicts:
	prometheus/src/com/strikeIT/prometheus/Enemy.java
	prometheus/src/com/strikeIT/prometheus/GamePlay.java
Merge branch 'Spencer-working' of
https://github.com/Vader19695/CSC122Game3 into Spencer-working

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master' into Spencer-working

Conflicts:
	prometheus/src/com/strikeIT/prometheus/GamePlay.java
	prometheus/src/com/strikeIT/prometheus/Prometheus.java
Merge pull request #2 from Vader19695/Spencer-working

God help us all