Added Entity class
Misc changes
Create README.md
Misc changes
Misc changes
Merge remote-tracking branch 'origin/master'
removed .idea clutter
removed .idea clutter
X
Merge branch 'master' of https://github.com/Rimdeker/Gaem

Conflicts:
	Main/src/com/rimxjoe/Game.java
Please work
Please work
Merge branch 'master' of https://github.com/Rimdeker/Gaem

Conflicts:
	Main/src/com/rimxjoe/Game.java
trying 2 werk
Merge pull request #1 from Naureg/master

Another attempt