replaced Andrew's rtf with Plan.txt
also fixed some toolbar stuff
Merge remote-tracking branch 'origin/master'