dumb
k
Merge branch 'second-build'
Merge remote-tracking branch 'origin/cameron'
GRR
camstuf

Conflicts:
	res/layout/activity_home.xml
Merge branch 'master' of https://github.com/dlmcewen/goldfish