Reverted
Merge branch 'master' of https://github.com/MikeAlune/mavee2

Conflicts:
	.idea/workspace.xml