Start making the Code and add some things to the gitignore
Merge remote-tracking branch 'origin/master'