wah
merging

Merge branch 'master' of https://github.com/sociam/socm2014-observing-social-machines
got rid of useless files