commit idea
c
Merge https://github.com/csiubru/CMS-Project

Conflicts:
	CMS/.idea/workspace.xml
a
Delete .idea