Still working on implementing my features
Merge branch 'master' of https://github.com/rockwotj/rose-hot-tips

Conflicts:
	static/js/rose-hot-tips.js
Merge branch 'master' of
https://sammystayz:1234C0g3nt@github.com/rockwotj/rose-hot-tips.git

Conflicts:
	templates/addReviewModal.html
	templates/userProfile.html
	
So closed to being finished but not quite there. still working on
displaying pepper