bug fix v.1.1 for production
resolve merge conflict
added notes, completed codding