initial commit of current files
Merge branch 'master' of https://github.com/ejdewhurst/3rd-year-project

i should learn git...