first commit
Trying again
Merge branch 'master' of https://github.com/Smudgerville/getting-started
for the love of god work