Updated
Merge branch 'master' of https://github.com/Harrison-Kailee/Team-1-F13-CIT261

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Signed-off-by: Kailee Harrison <kaileeharrison@gmail.com>
Merge branch 'master' of https://github.com/Harrison-Kailee/Team-1-F13-CIT261

Conflicts:
	src/shelves/public_html/javascript.js
	src/shelves/public_html/js/javascript.js
	src/shelves/public_html/kailee/javascript.js
	src/shelves/public_html/workers.html
	src/shelves/public_html/workers.js