image view
Merge branch 'master' into laptop

Conflicts:
	.xmobarrc