Unknown changes to General Project File

I don't know what the change is but it must be commited
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProgrammingPrinciples.wpu