korjattu

Merge branch 'master' of github.com:muuankarski/avointiede2013

Conflicts:
	.gitignore
Merge branch 'master' of github.com:muuankarski/avointiede2013