Test
Merge branch 'master' of https://github.com/mmnaviwala/COSC3380_TEAM6

Conflicts:
	Team6/Team6/Models/Criminal.cs