setup - initial setup
Merge pull request #1 from thomasmckay/setup

setup - initial setup