starting development with Slick2D
Merge branch 'master' of https://github.com/nmargie/DRUMotion
"this will hopefully fix git bullshit"