/* BRACKETS */
Merge remote-tracking branch 'origin/master'

Conflicts:
	StaTapAlpha/src/com/example/statapalpha/SqliteHelper.java