Adding Icons, Finishing Template.
Merge branch 'master' of https://github.com/b40houghton/MrHoughton