Caps
Merge branch 'master' of github.com:templaedhel/rebase-demo

Conflicts:
	readme.md
Switch