install java and PyCharm
~~
Merge branch 'master' of https://github.com/Jayin/jayin.github.io

Conflicts:
	diaries/1.json
	diaries/info.json