added new items
Merge branch 'master' of https://github.com/charlesxyan/bin

Conflicts:
	post-install.sh