idea
Merge branch 'master' of github.com:chioshinu/praxis

Conflicts:
	.idea/workspace.xml