updated notes
Merged master fixed conflict