Yes, I just added ~
Merge branch 'master' of https://github.com/william-fiset/Branch_Test

Conflicts:
	master_file