remove extra readme file
pull from upstream
pull from recent branch
pull from upstream
bundle that changes Gemfile.lock
merge with ninefold branch
Merge pull request #66 from kz363/ninefold

Trim code fat
merge from upstream
make map bigger
add danielle's link information
edit typo in danielle's github link
Update README.md
remove unused twitter links
Modify .travis file
Merge pull request #67 from newrube7/ruben/controller_specs

Modify .travis file
Travis file updated for twitter api
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll into ruben/controller_specs
Merge pull request #68 from newrube7/ruben/controller_specs

Ruben/controller specs
Update README.md
pull from upstream