Just following the prompts of the source control app.
Merge branch 'master' of https://github.com/cderoove/damp.ekeko.aspectj

Conflicts:
	EkekoAspectJ/src/damp/ekeko/aspectj/assumptions.clj