- add .idea file `workspace.xml` to ignore
Merge branch 'master' of https://github.com/affka/Jii

Conflicts:
	.idea/workspace.xml