Ola
Merge branch 'master' of https://github.com/oh-iub-3/oh-iub-3.github.io

Conflicts:
	index.html
Merge pull request #19 from vederejothin/master

Jothin' changes version 2