fixed merge conflict
Merge branch 'master' of github.com:MusicAdam/networkingproject
added movement