fuck descriptive commit names
Merge branch 'master' of https://github.com/awiss/mhacks