Readme.txt
Merge branch 'master' of https://github.com/solimand/Android_EC

Conflicts:
	README.txt