I didn't make any changes

...but it is telling me I have
Merge branch 'master' of https://github.com/sqlhammer/CIS470-Devry-Senior-Project

Conflicts:
	WSC/WSC.v12.suo