Pledges working off of project page; routes fixed
Merge branch 'master' into yuri