Restarted Project using TwoViewApp Template
Merge branch 'master' of https://github.com/Laracuet/YHack-TextClerk

Conflicts:

TextClerk/TextClerk/TextClerk/TextClerk.xcdatamodeld/TextClerk.xcdatamod
el/contents
Fixing Merge Errors