fixed bug
merge resolved
added notes, compteted coding