remove extra readme file
pull from upstream
pull from recent branch
pull from upstream
bundle that changes Gemfile.lock
merge with ninefold branch
merge from upstream
make map bigger
Update README.md
pull from upstream
change danielles team role in readme
remove dump
remove comments
Merge pull request #69 from danielleadams/master

Changed name/Update master to correct map sizes
Merge branch 'master' of https://github.com/cicadas-2014/EmotionAll into ninefold
Merge branch 'master' of https://github.com/kz363/EmotionAll