Testing conflicts
Merge branch 'master' of https://github.com/steveaw/anki_addons.git

Conflicts:
	README