Merge pull request #1 from gflateman/master

Merges Profile and Project Pages