committing to pull
Merge branch 'master' of https://github.com/UA-CS491-591/WHNewsWriter

Conflicts:
	WHWriterApp/WHWriterApp/EditorViewController.m