Init
Change 1
Set of changes
Changes in new_branch
changes
Conflicts during merge
Merge branch 'master' of https://github.com/oggius/amsterdam-basic