Merge branch 'master' of github.com:shanet/asimov

Conflicts:
	README.md