.idea file created
Merge branch 'master' of https://github.com/jtk217/peer-grader

Conflicts:
	.idea/workspace.xml