overwritten fixes
Merge branch 'cheryl' of https://github.com/clay-reed-a/thefirstsite into cheryl