added changes
Merge branch 'master' into stylebranch
Merge pull request #30 from paulhyunkim/aarontsangbranch

Aarontsangbranch
Merge branch 'master' into stylebranch
can now update coordinates on users as they load page
have rspec running
merge conflicts
Merge pull request #32 from paulhyunkim/stylebranch

Stylebranch
alert boxes
Deployed