abc
add images
Merge branch 'master' of
https://github.com/LittleFire1989/DreamDiary.git

Conflicts:
	gen/org/mengker/dreamdiary/R.java
gitignore