inb4 the merge
Merge branch 'master' of https://github.com/craigthelinguist/KnightCapital
Merge branch 'master' of https://github.com/craigthelinguist/KnightCapital
added icon loader