First Push of all files
Merge branch 'nathan_edits'
Finally all of the files