Penis
Merge branch 'master' of https://github.com/TrimDich/trimm-dich

Conflicts:
	TrimmDich/res/values/strings.xml