hello world

just testing out github is all
Merge pull request #4 from Jakovall/master

testing