uaie,auieui
Merge branch 'master' of github.com:SINTEF/test

Conflicts:
	README.md