committing cole's stuff - dustin
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/capture-iowa

Conflicts:
	themes/captureiowa/js/init.js