Ed changing stuff
Merge branch 'master' of github.com:Griffinstein/jewelwebsite