share image
Merge branch 'master' of https://github.com/farahs/pockettrainer

Conflicts:
	res/layout/activity_training_result.xml
	src/com/pockettrainer/TrainingResultActivity.java