Merged the two vesions of code - version contains validation and tided up code
Merge branch 'master' of https://github.com/rednanor/GroupProject