updated .gitignore
resolved merge conflict
Merge branch 'master' of https://github.com/paulhhowells/tagline
convert To Do list to nested checkboxes