added some other guy to members.txt
added some other guy to members.txt
fixed conflicts