This is a conflict test

Signed-off-by: johan <johanfredriksson1987@gmail.com>
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	Shiny-Bear-Toolkit/Program.cs