first commit
added hello
added whatever
Merge branch 'master' of https://github.com/SamFalk/testing
Merge pull request #1 from SamFalk/master

change this?