Merge branch 'master' of https://github.com/erik-owens/confParse

Conflicts:
	.idea/workspace.xml