Update main.html
Merge branch 'dev' of https://github.com/slydevis/NDI2014 into dev