made change
small change
Merge branch 'somethingDifferent'

Conflicts:
	KoodaaJotakin/Main.cpp