Finished movement logic
Merge remote-tracking branch 'origin/SagieBranch'
Finished move logic...
Merge remote-tracking branch 'origin/SagieBranch'
Merge remote-tracking branch 'origin/master' into Tom