Ignore .idea folder
Merge branch 'master' of github.com:rafaelcn/JAD

Conflicts:
	.gitignore
Ignore .idea folder