commit from my laptop
Merge branch 'master' of https://github.com/Rijir/.files

Conflicts:
	.bashrc
	.vim/bundle/nerdtree
	.vim/bundle/syntastic
	.vimrc