Merge pull request #17 from rctoris/devel

super messy working version
grunt added (failing)