to be overwritten shortly
merging with upstream
Merge branch 'master' of https://github.com/NatalieP-J/Summer2014
updated