Installing slim rails gem
Executing demo of slim template
Installing slim rails gem
Executing demo of slim template
resolve some conflicts
resolve some conflicts
Merge branch 'master' of github.com:alishahpakneeds/cms_rails

Conflicts:
	.idea/workspace.xml