Adds jquery instead of grabbing it from a cdn. We don't wan't wonky connections cramping our style.
Lots of cleanup.
Git is being wonky AF.
Merge branch 'master' of github.com:jdarling91/hci_proj into cleanup_23oct1728

Conflicts:
	api/clipping.php
	api/file.php
	api/rest/clipping.php
	api/rest/file.php
	api/rest/user.php
	api/user.php
	assets/js/load_clippings.js
	assets/layout/footer.php
	assets/layout/header.php
	helpers/javascript_variable_injection.php
	index.php
Merge pull request #7 from jdarling91/cleanup_23oct1728

Cleanup 23oct1728