Typo
Added IntelliJ IDEA
Merge branch 'master' of github.com:icoloma/dotfiles

Conflicts:
	java/install.sh