Merge pull request #1 from PdxCodeGuild/master

update from master
fixed broken link in base.html
changed copy on front page.
fixed typo in ppm.html
Merge pull request #10 from ccjoness/master

many changes