test commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	LearnCards/src/com/gen/ius/nod/learncards/MainActivity.java