I modify the cover page
I solved confict in cover by adding all the content, with extra editing
Merge branch 'master' of github.com:patrick-ausderau/software_engineering_2014_template