Test #1
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/sashawilljerry/tipjar/CounterActivity.java