From Work pc
1
Commit second line in header
Merge remote-tracking branch 'origin/master'

Conflicts:
	.cproject
	.gitignore
	.settings/org.eclipse.cdt.managedbuilder.core.prefs
	src/HelloWorld.cpp
	src/resource