add more gui components to website
Merge branch 'master' of https://github.com/labatbouta/webwareproj3

Conflicts:
	.idea/workspace.xml
add highchart to project