Added Settings page
More settings changes
Merge pull request #2 from Marauders/ubuntu

Ubuntu