worked on front end stuff
Merge pull request #7 from klesse413/jm

worked on front end stuff