working on the main page
changes to project intake form, nav
Merge pull request #13 from lessin/master

working on the main page
resolving conflict