Merge pull request #3 from TeamProject1014/master

Eamon & Luke code commited
Merge pull request #11 from liamwaugh/branch_LW_20140316

Merge pull request #3 from TeamProject1014/master