made commit-remote
added commit-remote into master for a conflict
Merge branch 'feature-branch-remote'

Conflicts:
	commit-remote.txt