Partial change rules in DB, need to commit to pull.
Merge branch 'master' of ssh://git@github.com/danielfinke/cpsc472.git
wtf they have question marks. These are andrews, not mine
fix bugs before continuing, hopefully isnt too painful.
Most of Rule defns done. Just need to add to rules to db on add clicked.
Merge branch 'master' of ssh://git@github.com/danielfinke/cpsc472.git

Conflicts:
	res/values/strings.xml