Merge remote-tracking branch 'origin/AndreBranchModel'

Conflicts:
	.gitignore
	Console Unit Test.v12.suo

didntchangeshitbitch
sadsd

sds