Added location & point coordinates, have not linked location with games yet
Merge 2 branches