Merge branch 'master' of C:\SemesterProject with conflicts.
put is added
validation between JAVAserver and expressServer works
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/view3/view3.html
	public/app/view3/view3.js