added profile page
Merge branch 'master' of https://github.com/julianborrey/tabSite

Conflicts:
	app/assets/stylesheets/.user_pages.css.scss.swp