initial commit
Merge branch 'master' of github.com:sociam/socm2014