update
merge
config
Merge branch 'master' of github.com:akiyan/config

Conflicts:
	setup