update progress of task cout to 99
add assets and workspace to ignore list.
update gitignore for conflict.