Merge branch 'feature/MadLibs_Tool' into develop
ABPricing_1 - Test 1 and Test 2 prototyped
Merge branch 'feature/ABPricing_1' into feature/RS_redesign

Conflicts:
	wp-content/themes/ecustom/js/ecornell.min.js
	wp-content/themes/ecustom/js/unpacked/ecornell.js
	wp-content/themes/ecustom/one-pager.css
	wp-content/themes/ecustom/sem.css
	wp-content/themes/ecustom/style.css