started settings
New stuff
added
Merge pull request #1 from cakesofwrath/master

Master