added file hej
added test.cc for conflict showcase
Merge branch 'gitTestBranch'
removed some code
added variable a
Merge branch 'gitTestBranch'
Merge branch 'conflictBranch'

Conflicts:
	test.cc

Resolved conflicts