pulling twitter changes
events on the map
fixed merge conflicts
Merge pull request #4 from ztnark/eventful

Eventful