OMG! My first commit
another commit
Added a default value
detached HEAD then committed a change
errr...don't know what I'm doing
fixed a branch merge conflict
another random change
a change
deleted some comments
Merge branch 'master' of https://github.com/Neilos/MakersAcademyFirstTest