updated from hackday 3
Merge pull request #57 from jared-schmidt/hackday3

updated from hackday 3