updated to reflect lecture from 21/07/2014
Merge pull request #1 from jacobwills/i-fucked-up

updated to reflect lecture from 21/07/2014