some updates
Merge branch 'master' of https://github.com/kelto/software-project
customize now works
Merge branch 'master' of https://github.com/kelto/software-project