Merge of Noahs first commit

Get used to the pull request workflow and comments
fixed