Major Sync

Conflicts:
	src/css/styles.css
	src/jam_jar_cal.html
	src/new_moments_completed.html
	src/new_moments_confirm.html
	src/new_moments_form.html