Old stash
Merge branch 'master' of https://github.com/GabrielGhe/YHack2014Server
Merge branch 'master' of https://github.com/GabrielGhe/YHack2014Server
Display x,y value on canvas
Merge