Change #2
Merge branch 'master' of https://github.com/retricide/aevidi

Conflicts:
	README.md