setup.sh update
setup.sh update
Merge branch 'master' of github.com:princehaku/amm

Conflicts:
	install/setup.sh