updating mamute
Merge branch 'master' of heroku.com:mamute-demo
updating mamute