Merge remote-tracking branch 'origin/master'
Merge branch 'master' of ssh://git@github.com/boebu/ch.bfh.bti7081.s2013.yellow.git

ok