added change
Merge branch 'master' of https://github.com/chvtk/myfirstgit
Changes made to resolve conflict
Conflicts:
	file_for_push_example