path
Merge branch 'master' of github.com:posva/dotfiles
vimrc java syntastic
Merge branch 'master' of github.com:posva/dotfiles
java header for a project
vimrc nerdcommenter+gitconfig lg alias
java
Merge branch 'master' of github.com:posva/dotfiles

Conflicts:
	vim/ftplugin/java.vim
Merge branch 'master' into imag

Conflicts:
	bashrc
	vimrc