Update .xinitrc
Create makefile
Update makefile

Add .conky-i3bar to install-conky
i3 config update
i3 config: Fix chrome shortcut.
i3 and conky tweaks
.conkyrc tweak
Merge branch 'arch'

Conflicts:
	.conky-i3bar
	.conkyrc
	.i3/config
	.xinitrc