added % to all \includgraphics{} in order to be able to compile when not having the graphic files
resolved conflicts