test

test
Merge remote-tracking branch 'origin/develop' into ray_branch
Test commit

Trying github
Getting from develop
update export sql
Task code
Merge branch 'ray_branch' of https://github.com/CS673F14P4/ProjectManagementTool into ray_branch

Conflicts:
	ProManageDAO/sql/cs673_export.sql
Refactoring Task Code
removing bin folder
Logout
Resolving bugs with Task DAO
Merge remote-tracking branch 'origin/ray_branch' into develop

Conflicts:
	ProManageDAO/sql/cs673_export.sql