add icons
Merge branch 'master' of github.com:jnorthr/TextEditor
amerge something: