initial commit all my work
fixed coflict