Layout settings activity
Money activity finishiiiiished
Merge branch 'master' of https://github.com/Morlack/Smoke-B-Gone

Conflicts:
	res/layout/activity_settings.xml