gitacp api + formulas
Merge branch 'master' of github.com:neves/unix

Conflicts:
	formulas.sh