Merge pull request #1 from sam-meacham/sam-dev

Sam dev
Merge branch 'master' of https://github.com/sam-meacham/webstack into sam-dev