initial setup
Merge github.com:jnorthr/TextEditor
blend local and repo