switched 1st and 2nd args to make it easier for rest.sh
Merge branch 'master' of https://github.com/mgenev/angelhackGemini2
fixed some small errors
Merge branch 'master' of https://github.com/mgenev/angelhackGemini2
* small fixes