Ignore suo on this branch for some reason
Merge branch 'Chris' into dev

Conflicts:
	.gitignore
Ignore bin