master checkout
bugfix version 1.1 for production
resolve merge conflict
added notes, completed coding