Merge pull request #1 from kerstin/master

a new file for your repo!
student.rb first commit
testfile on master while student has new files
merge changes from student branch