Shop class no GUI to test code
Merge branch 'darren'
Merge branch 'master' of https://github.com/fcpteam1/project/
Merge branch 'master' into darren