why do i have to check this in
Merge branch 'master' of https://github.com/standersnerdery/TroutMaps

Conflicts:
	.idea/workspace.xml