Dylan's test commit

abrbrbrbrbrbrrbbr
Dylan
Merge branch 'master' of https://github.com/dlmcewen/goldfish

Conflicts:
	res/layout/activity_home.xml