starting out ...
removing index
replacing index
replacing index
replacing index
no message
trying index update
Merge branch 'master' of 104.131.19.244:site

* 'master' of 104.131.19.244:site:
  trying index update

Conflicts:
	index.html
small update before hopeful commit
small update before hopeful commit
Merge branch 'stage' of 104.131.19.244:site into release/rc1-functional-nodraw
Cleaning up merge with Production server