nada
idontwantto
xml stuff finished
buttons now work appropriately, settings fragment done for now
Merge branch 'settings'
.
Merge branch 'master' into jake