More edits
Merge branch 'master' of https://github.com/Symphonise/Testing
Testing still.