[+]: some useless stuff
Merge branch 'master' of github.com:vslapik/LinuxConf
remove echo from bashrc as it interrupts scp
Merge branch 'master' of github.com:vslapik/LinuxConf

Conflicts:
	.bashrc
	.vimrc
asdfd