added answer email, merged pending conflicts
Merge branch 'master' of https://github.com/itanev/Mighty-Mouse