ignoring .sln files
Merge branch 'master' of https://github.com/Dunlain/CSC492-FinalProject

Conflicts:
	CSC492-FinalProject-csharp.sln
	CSC492-FinalProject.sln
Merge branch 'master' of https://github.com/Dunlain/CSC492-FinalProject