CA done, started at heimstaden
merge
Merge branch 'master' of github.com:hansson/rentit

Conflicts:
	README.md