Merge pull request #1 from omfgitsjack/master

mergee
Merge pull request #33 from omfgitsjack/frontend

Merge pull request #32 from omfgitsjack/master