fixed twitter geo issues, working on second part now
Changed up the html/added mashup pages.
Merge pull request #13 from littlemeg27/master

project 4 pull request