add new text
bug fix, v 1.1 for production
add new text
resolve merge conflict
added notes, completed coding