Add dwmstatus.o to gitignore
Merge branch 'master' of github.com:joshaw/bin

Conflicts:
	.gitignore