asd

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

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

Conflicts:
	themes/studentlife/css/master.css
moved analytics to the head instead of the footer

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