mac github commit test.
Merge branch 'master' of https://github.com/tecshuttle/memorize

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/tecshuttle/memorize