Some with changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Team05/Code/Static-Code-Analyzer.suo