repo merges
Location updating added

Now players can update their positions.