Merge pull request #1 from mrEvanidus/Jaimiey

this is a test for a seperate branch.
Merge pull request #2 from mrEvanidus/Jaimiey

Deleted a couple of files.
Merge branch 'master' into Jaimiey
argh