link
Merge branch 'master' of https://github.com/wdi-sf-jan-2014/todo_spa
end of review
fixed merge conflicts