Resolved merge problems; added a button to instructions.
Merge branch 'master' of https://github.com/130610/sd-project
Add the todolist.txt