phphack
up vim
Merge branch 'master' of github.com:enlacee/devTool

Conflicts:
	developer/mysql.sh
	ide/vim.sh
rename files merge