Merge pull request #1 from dannyreil/basicSetup

Basic setup
Merge pull request #2 from dannyreil/master

Merge pull request #1 from dannyreil/basicSetup