delete bin/start-xmonad merged from job branch
need not start skype auto
battery seems to be useless, so remove it
add conky to Makefile
rename get_key_name to get-key-name
change the logo path in conkyrc to make it displayed
change the temp to WUHAN, change the type of own window to override and change the alignment
Merge branch 'master' into job

Conflicts:
	conky/conkyrc