Added powerpoint
fixed merge conflicts