Profile page.
Merge branch 'master' of https://github.com/chrissybagel/pic-flick into chrissybagel-master
Merge branch 'chrissybagel-master'
Merge branch 'master' of https://github.com/tech-sassy-girlz/pic-flick

Conflicts:
	.DS_Store
	views/.DS_Store