acontero/TaskListApp — pull request #3 by jnbaker (2013-07-14 15:11:02+00:00)
Title: fixed merge conflict

fixed