undo fixes
Merge branch 'master' of github.com:daboe01/CPTextView
merge
fixed preprocessor stuff