Merge two different implementations of client

Now you can both move and create tiles
Merge branch 'master' of github.com:matessim/GGJ2014