test commit
Merge branch 'master' of https://github.com/kprokken/rapid_web

Conflicts:
	Test.txt
merge fix