third commit
Merge branch 'master' of github.com:phil-type-r/Testing

Conflicts:
	.idea/workspace.xml
clean project