Some tiding
Merge branch 'master' of https://github.com/horizon-institute/aestheticodes

Conflicts:
	.gitignore
	.idea/workspace.xml