becky made changes!
Merge branch 'main-master' + fix merge conflict

Conflicts:
	wp-content/themes/fightlynch/library/css/style.css
Merge pull request #13 from beckyrother/master

CSS edits