bug fix, v1.1 for production
first merge, resolve merge conflict
added notes. completed coding