added in second comment from another source to test conflict
test conflict
Merge branch 'master' of https://github.com/nypgit/it1537test.git

Conflicts:
	MySwingProject/bin/it1537/dao/MemberDAO.class
Merge branch 'master' of https://github.com/nypgit/it1537test.git

Conflicts:
	MySwingProject/bin/it1537/dao/MemberDAO.class