haha
haha
haha
haha
haha
haha
haha
haha
haha
haha
haha
haha
haha
haha
Merge branch 'master' of https://github.com/3203317/nana

Conflicts:
	android/db.db3