Add Criteria, and start of Add Assessment Item
Merge branch 'master' of https://github.com/nicmoon/cs361-GroupProject

Conflicts:
	DatabasesProject/DatabaseProj/DatabaseProj/HomeScreen.Designer.cs