merging client stuff
Merge branch 'master' of https://github.com/marce155/eat-em-up