Initial commit
commit master
Merge branch 'master' of https://github.com/alaahong/Diary4J
master

Signed-off-by: Ian <argentum.zhang@gmail.com>
master
Merge branch 'master' of https://github.com/alaahong/ArpilAssisant

Conflicts:
	LICENSE
	README.md