added some stuff to settings page….prettyfy it for me?
Merge remote-tracking branch 'origin/master'