local
Connection. Not working
Conn
Merge branch 'master' of git@github.com:LittleFire1989/DreamDiary.git

Conflicts:
	bin/AndroidManifest.xml
	bin/DreamDiary.apk
	bin/classes.dex
	bin/resources.ap_
Con