Final Front End Adjustments
Merge branch 'master' of https://github.com/sivulka/H2OhShit-