fixed conflict and made us the first ever team in Finland.
Merge pull request #2 from Vaakapallo/gh-pages

fixed conflict and made us the first ever team in Finland.