Clean file (Development branch has initial file with several options for possible alteration)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml