indermediate changes; merging with parker.
Merge branch 'master' into secondary
about to implement slick2d.
Merge branch 'master' into secondary
Merge branch 'master' into secondary
The one commit to rule them all.