Merge branch 'change_pass' of github.com:blackchair/parley into change_pass
fix order
Merge branch 'change_pass' of https://github.com/blackchair/parley
this will hopefully merge, merging the real way didnt work