Sarah's Commit
Hi. I'm a CSS file in the HTML directory. Deal with it.
Sarah's Commit  2
Hello Gabriel.
Merge remote-tracking branch 'origin/stage' into stage
Hello Gabriel
my commit 2
Merge remote-tracking branch 'origin/stage' into stage-test

Conflicts:
	html/index.html
Sarah's Commit  2
Merge remote-tracking branch 'origin/stage' into stage

Conflicts:
	html/index.html
Merge remote-tracking branch 'origin/stage' into stage

Conflicts:
	html/index.html
Stuffs
Merge branch 'stage' of https://github.com/voltron-ids-test/test into stage
my commit 3
my commit 3
my commit 3