work space change
Merge branch 'master' of https://github.com/seanicus/trello-testcaserator

Conflicts:
	.idea/workspace.xml