Changes one
Merge branch 'master' of https://github.com/lauramorris/e7
Sync up