ready to merge

Signed-off-by: ChiChou <chichou@iceboy.org>
Merge branch 'codecolorist' of https://github.com/ChiChou/AndNerd into codecolorist