Merge pull request #1 from GoogleJump/master

Merging new frontend
Reorganized views and static files. integrated new profile page
Merge pull request #2 from eforbes/master

Reorganized to allow for new views