Merge of Noahs first commit

Get used to the pull request workflow and comments
Are you using tabs?  Converting all tabs to spaces will make sure it looks the same in all editors.