changes...
Merge branch 'conflict-example' of https://github.com/MissStryker/first-repository into conflict-example
Local changes.
Final revision