my first comit
Merge pull request #1 from lindlau/master

my first comit