Just getting everything up to date...
Merge branch 'master' of git@github.com:jaydm/litterBox.git

Conflicts:
	res/layout/litter_box.xml