first commit
Merge https://github.com/Griffinstein/jewelwebsite