Modified file in my new shiny branch
made change in master - watch out merge
Didn't remember to put comment.. trying out commit --amend feature!
Merge branch 'eliseLocal'

Conflicts:
	file1