ajde things
Merge branch 'master' of github.com:hongaar/ajde into upstream