Merge pull request #3 from TeamProject1014/master

Eamon & Luke code commited