image loading now requires you to hand in filepaths
Merge branch 'master' of https://github.com/craigthelinguist/KnightCapital