Add all initial files
Merge branch 'master' of https://github.com/ryanzbartlett/myFirstProject

fixing non-fast-forward