Initial set up complete
Merge pull request #2 from josteinstraume/initial-setup

Initial set up complete