(maint) edit file 3

Prior to this commit, file3 was much less awesome. This commit makes it
totally awesome now.
(maint) edit file 1

Prior to this commit I didn't know how to set up my EDITOR variable for git commits...

BUT NOW I DO!
Merge pull request #33 from jhcarr/learning/master/edit_file1

(maint) edit file 1