Merged Caleb's backend with index.html
Merge