Added settings menu, for real this time
Merge remote-tracking branch 'origin/master'