final commit before refactoring
Merge branch 'master' of https://github.com/AirRider3/ludumpad-client