commit before pull
adding measuring and some form elements
changing main.js because of minor syntax errors