after ssuns 2014 all is done
Merge branch 'master' of github.com:LucilleH/ssuns-2014