cool stuff!
Merge branch 'master' of https://github.com/NatPartouche/Test4Bill

Conflicts:
	anotherfil.txt