adding updates
Merge branch 'master' of github.com:olinfoundry/olinfoundry.github.com