add french fries
Merge branch 'master' of https://github.com/broccoli/test

Conflicts:
	file1.txt