ignored files /.idea/workspace.xml
Merge branch 'master' of https://github.com/seartles/simple_cms

Conflicts:
	.idea/workspace.xml