Portrait changed to People as per her request.
Commit work
Merge branch 'master' of https://github.com/Alcha/Cheyenne-Photography

Conflicts:
	WebContent/WEB-INF/view/template.jsp
	WebContent/css/Max.css