merge
Merge branch 'twitter-stream' into dev
sidekicked
typos
Merge branch 'twitter-stream' into dev
update gmefile
Merge branch 'models' into dev
update readme