user 2 commit
new user change

Merge branch 'master' of https://github.com/branaugj/conflict_test

Conflicts:
	file