Sam stuff
Merge branch 'master' of https://github.com/fameman100/GroupProject