modified file1
Merge branch 'master' of github.com:cstuy-hacking-sessions/sample

Conflicts:
	file1