Final version

Added icons to 2 tabs, other than that it's as submitted for sprint 2.
Merge pull request #42 from conclarke/master

Final version