Merge pull request #1 from edallman/master

testing pull request
re-installed grunt
Merge pull request #2 from phrichards/master

re-installed grunt
testing
Merge pull request #3 from phrichards/master

testing
Merge pull request #4 from edallman/master

style guide add!