Merge branch 'master' into patch-1

diff --cc Makefile
index b12bff61f4ba9aef27b7540709cdeea34efbc153,3336e3cef0c342691673d06f7f16776beed5eaca..ad7e7012124a9d22173ff2c0487a50118f8466fa
--- 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