Merge conflict for gchronis. You're welcome.
Delete contents of nates_file

Before this commit there was text in nates_file that didn't belong there.
This commit removes it.
Merge pull request #55 from gchronis/feature/master/edit_nates_file

Delete contents of nates_file