Initial commit
completed exercise
merging conflicts