Merge remote-tracking branch 'remotes/origin/master' into studentView#15

dragonman117 wants to merge 1 commit into

masterdragonman117/JNetTest:masterfrom

studentViewdragonman117/JNetTest:studentViewCopy head branch name to clipboard