dr1 try1
dr1 try2
work'
dr1 try2
dr1 try commit
dr1 try commit again
stupid files
what the hell
no
Merge branch 'master' into dr1

Conflicts:
	.idea/workspace.xml
	membersname.txt
dr1 worked