first commit
initial import
Merge branch 'master' of https://github.com/danieljnilson/saltywork
Just trying to get this to work!