Merge branch 'master' into patch-1

diff --cc Makefile
index b12bff6,3336e3c..ad7e701
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  PREFIX ?= /usr/local
- 
+ CC ?= cc
  output: dwmblocks.c blocks.h
-       cc dwmblocks.c `pkg-config --cflags x11` `pkg-config --libs x11` -o dwmblocks
 -      ${CC} `pkg-config --cflags x11` `pkg-config --libs x11` dwmblocks.c -o dwmblocks
++      ${CC} dwmblocks.c `pkg-config --cflags x11` `pkg-config --libs x11` -o dwmblocks
  clean:
        rm -f *.o *.gch dwmblocks
  install: output