Merge pull request #22 from ShadowSam/master

This should add the new -settings- page that will be incorperating the a...