Merge pull request #4 from AbertayHackers/development

fixing the stuff 'people' messed up
Merge remote-tracking branch 'origin/development'