Hack fixes to get things working in instant WP. This build currently works in instant WP. It will absolutely not work anywhere else.
Merge branch 'dev' of github.com:jdarling91/hci_proj into instant_wp
Fixes PHP compatability issue.
Merge branch 'dev' of github.com:jdarling91/hci_proj into dev
Merge branch 'master' of github.com:jdarling91/hci_proj
Merge branch 'master' of github.com:jdarling91/hci_proj
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