added some bulshit code
Merge remote-tracking branch 'origin/master'

Conflicts:
	VineScope/pages/home/home.html
	VineScope/pages/searchresults/searchResults.html