Merge pull request #37 from jakehare/master

completed tasks page
did nothing
nothing