null
Merge branch 'master' of https://github.com/ajcummins/CS496Project.git
Merge branch 'master' of https://github.com/ajcummins/CS496Project.git
Merge branch 'master' of https://github.com/ajcummins/CS496Project.git

Conflicts:
	CS496_Project_Webservice/war/_view/MyCourseList.jsp