playing around with listview and gridview stuff
Merge branch 'master' of github.com:keidax/happytime

Conflicts:
	AndroidManifest.xml
	res/layout/main.xml
	res/values/strings.xml
	src/com/example/happytime/MyActivity.java