Merge branch 'j'
Merge pull request #1 from jordanabbasi/j

J
Merge branch 'j'
Merge branch 'master' of https://github.com/jordanabbasi/UnsocialNetwork
Merge pull request #2 from jordanabbasi/maps

added some of the maps stuff
improved maps, added stephens stuff
test commit
another test