old commits - to be overwritten by carros new content
Merge branch 'master' of https://github.com/tinkerton/gr_natverket

Conflicts:
	index.html
	js/case1_content.js