modified i3 for satellite laptop
Merge branch 'master'

Conflicts:
	.i3/config
	.i3/i3status.conf
	.vim/vimrc