ETH Commit
Merge branch 'master' of https://github.com/oOo0oOo/InspirationEngine

Conflicts:
	resources.py