Merge pull request #2 from kobelee/master

first test commit