bullshit location fuck
Beautiful shit
location kinda works?
Merge branch 'newLocationBranch' of https://github.com/CMPUT301F14T14/Project into newLocationBranch