Fixed some stuff.
Merge branch 'master' of github.com:pserwylo/herri-front-end