images

Signed-off-by: Brandon Ewoldt <bewoldt1@gmail.com>
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/vp-for-student-life
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/vp-for-student-life

Signed-off-by: Brandon Ewoldt <bewoldt1@gmail.com>

Conflicts:
	assets/Uploads/_resampled/SetRatioSize8060-finkbine-awards.jpg
	assets/Uploads/_resampled/SetRatioSize8060-multiculturalism-hero2.jpg
	assets/Uploads/_resampled/SetWidth291-Family-Weekend.jpg
	assets/Uploads/_resampled/SetWidth291-Leadership-Legacy-Intro-Photo.jpg
	assets/Uploads/_resampled/SetWidth291-Parent-Times-Newsletter2.jpg
	assets/Uploads/_resampled/SetWidth400-finkbine-awards.jpg
	assets/Uploads/_resampled/SetWidth400-multiculturalism-hero2.jpg
updated git ignore

updated git ignore

Signed-off-by: Brandon Ewoldt <bewoldt1@gmail.com>