Latest VERjjjjjjj
Merge branch 'master' of https://github.com/dwarstler/Peoples--Consultants

Conflicts:
	PeoplesC/.idea/workspace.xml
	PeoplesC/PeoplesC.iml
	PeoplesC/app/views/carousel/carousel.html.erb