Updates
Merge branch 'master' of https://github.com/walshc/.i3

Conflicts:
	lock.png