base setup
Merge pull request #2 from dpowers16/master

base setup