I'm trying to change my working directory and I needed to push all the changes I had so I could just clone it over.

This probably destroyed something, somewhere that you've changed in your last few commits.
On a side-note, I edited jQuery-min to remove a few depreciated functions it was using. It was probably using them for a reason, but it had no affect on our page so... *shrug*

Signed-off-by: Daktyl198 <rootme198@outlook.com>
Merge branch 'master' of https://github.com/Daktyl198/SPOTS

Conflicts:
	index.php