First commit of the first task
Seconf commit of the first task
third commit of the first task, ommited a middle change in the file while adding
fourth commit of the first stretch task
stretch tast, when you delete with the move to trash command you need to add and then commit
moving a file
Starting teh second excercise
Creating conflicts
adding a new file to the new branch
conflict file from master
Merge branch 'new-branch'

Conflicts:
	src/file4.js