Task code
Merge branch 'ray_branch' of https://github.com/CS673F14P4/ProjectManagementTool into ray_branch

Conflicts:
	ProManageDAO/sql/cs673_export.sql