? I don't know why package.json changed.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
Reorganized navbar. Created Services & Testimonials tab.
Merge remote-tracking branch 'upstream/master'
?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
Split foot into foot_start and foot_end, head-style (simplifies per-page scripts that use jQuery)
Moved/created edit- and view-specific scripts into respective EJS files
Added file upload button (only adds to table for now)