Fix formatting
Merge branch 'master' of github.com:gapan/salix-startup-guide
Implement make upload