Preparation for game location
Merge branch 'master' of https://github.com/andyxmai/pickup

Merging Andy and I's changes
Merge conflict fixed
Merge branch 'master' of https://github.com/andyxmai/pickup
Game function based on id
Merge conflict fixed views.py