writing some cool stuff in the files
added correct numbers
Merge branch 'branch123'

Fixed merge booya!

Conflicts:
	fakedir1/file5