random colors trop jolies
Merge remote-tracking branch 'origin/greg2'

Conflicts:
	Project/res/layout/row_item_layout.xml