Dylan's test commit

abrbrbrbrbrbrrbbr
dumb
Dylan
kkkkkk
Merge branch 'second-build'
Merge remote-tracking branch 'origin/cameron'
Merge branch 'master' of https://github.com/dlmcewen/goldfish

Conflicts:
	res/layout/activity_home.xml
New Text
Merge branch 'master' of https://github.com/dlmcewen/goldfish
Ooga Booga
GRR
Merge branch 'master' of https://github.com/dlmcewen/goldfish
camstuf

Conflicts:
	res/layout/activity_home.xml
Merge branch 'master' of https://github.com/dlmcewen/goldfish
test commit
Oct 6
Successful Initial Build
Delete File I:O in C.txt
Build
D