modified p5.html and p5.js
Merge branch 'master' of https://github.com/IrisG33/Capstone

Conflicts:
	Capstone/war/form2.html