front end goodness
updates and things
Merge branch 'master' of github.com:backjo/mhacks4