First commit
Merge https://github.com/schurc01/JJWebsite