update amon2
Merge github.com:zdogma/MyApp
add amon2
Merge branch 'master' of https://github.com/zdogma/MyApp
Merge branch 'master' of https://github.com/zdogma/MyApp