Resolving conflict error with WebStorm File .idea
Working with SmartGit to resolve conflict issue as described in MIU videos
Merge remote-tracking branch 'refs/remotes/origin/master' into gh-pages

Conflicts:
	.idea/workspace.xml