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
small update before hopeful commit
small update before hopeful commit
small update before hopeful commit
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
Merge branch 'master' into release/rc1-functional-nodraw

* master:
  Cleaning up mobile nav bar
Merge branch 'release/rc1-functional-nodraw' into production/prod

* release/rc1-functional-nodraw: (47 commits)
  Cleaning up mobile nav bar
  Cleaning up merge with Production server
  Updated no active grid item repositioning error
  Cleaning up layout/icons; Fixing footer colors;
  Cleaning up layout/icons; Fixing footer colors;
  Fixing the scroll offset for projects
  Fixing the scroll offset for projects
  Merge Production into Master for tagging purposes.
  Adding Media Styles & Functionality
  Media Controls/Playback working as intended.
  Media Controls/Playback working as intended.
  Open/close animations on Project Views
  Prepping Grid to open project view at specific location in grid
  ScrollTo Working well
  Finished Mobile Nav drawer layout;
  Updated Mobile Nav-Open functionality; Nav-Open/Close X for mobile header;
  Updating Project models; Adding client/agency partner info to Project Models; Injecting API data in to index template to minimize requests;
  Updating media container
  Added project view styles
  Using events to trigger methods on views; Updating views to handle data loading better.
  ...

Conflicts:
	index.html
no message