please no merge conflicts
Merge branch 'master' of github.com:awiss/mhacks
Add modal and animations and shit