wireframe2

attempt 2 at committing
Merge branch 'master' of https://github.com/clairityproject/trial

Conflicts:
	Wireframe1.js
	js/bootstrap.min.js
	wireframe2.html
cc changes

can’t remember what changes were made
Merge branch 'master' of https://github.com/clairityproject/trial