finished profile page
Merge branch 'master' of github.com:jamesl88/type-