Fixing file structure.
Merge branch 'master' of github.com:UniversityofHelsinki/styleguide

Conflicts:
	README.md