working on sending user location to Parse
resolve merge conflict with HomeViewController.m
Merge branch 'master' into beacon
commit WIP for master push by Steve
Merge branch 'master' into beacon
completed sending location to parse