Merge branch 'master' of https://github.com/shanti-uva/shantiHTML

Conflicts:
js/main.js