order mail fix
Merge branch 'master' of github.com:markkxm/amigo
merge test 2