commit from local, changes to first and last lines
Merge branch 'merge-conflict-example' of https://github.com/githubstudent/newproject into merge-conflict-example

Conflicts:
	first.txt