Added settings page to settings menu (not saving data yet though)
Merge remote-tracking branch 'origin/master'