.gitignore and zsh conf files added
Merge branch 'master' of https://github.com/navj88/conf
java conf was added to the last commit