Merge pull request #1 from SiriusA/master

Eclipse stuff was not loaded into original
Merge pull request #2 from SiriusA/master

changes to player and entity
Merge pull request #3 from SiriusA/master

changes to player and entity again
Merge pull request #1 from Hriedmarr/master

merge
Merge pull request #4 from ihatejakeeason/master

asdf
Merge pull request #5 from SiriusA/master

sadfa
commentS
Merge pull request #6 from SiriusA/master

asdghkilo;'
cake
cake
cake2
Merge pull request #1 from Hriedmarr/master

fghjkl;'