remove bin/start-xmonad
remove battery
add conky-all to Makefile
change get_key_name to get-key-name and make the logo displayed
Merge branch 'master' into job

Conflicts:
	conky/conkyrc
Squashed commit of the following:

commit 3f7c753819e9b7df9f02bb5563bd6063450adf7e
Author: Lee <kos1990l@gmail.com>
Date:   Fri Apr 5 17:27:14 2013 +0800

    change net rings to battery ring
Squashed commit of the following:

commit 99ea2cbee9710bd36ba24f5db79ae0d20a7081d2
Author: Lee <kos1990l@gmail.com>
Date:   Sat Apr 6 23:23:37 2013 +0800

    change some color

commit e7036df367b33c957b55e38cc1e59654947dae8d
Author: Lee <kos1990l@gmail.com>
Date:   Sat Apr 6 11:15:39 2013 +0800

    start nm-applet

commit 94bcea03f150c330dc16945236fc7eef6e0bed70
Author: Lee <kos1990l@gmail.com>
Date:   Fri Apr 5 18:17:42 2013 +0800

    add TODO file

commit 3f7c753819e9b7df9f02bb5563bd6063450adf7e
Author: Lee <kos1990l@gmail.com>
Date:   Fri Apr 5 17:27:14 2013 +0800

    change net rings to battery ring
change a background image
Merge branch 'job'