implemented project progress
merge changes