Merge branch 'master' of github.com:duffcodester/digiquatics into staging
Merge branch 'staging' of github.com:duffcodester/digiquatics into getting_started
Merge branch 'master' of github.com:duffcodester/digiquatics into staging
Merge branch 'fix_private_lesson_submission' of github.com:duffcodester/digiquatics into staging
Merge branch 'staging' of github.com:duffcodester/digiquatics into staging
Merge branch 'fix_private_lesson_submission' of github.com:duffcodester/digiquatics into staging
Attempt to fix email bug
Attempt #2
Attempt #3
Merge branch 'fix_private_lesson_submission' of github.com:duffcodester/digiquatics into staging
Merge branch 'small_ui_fixes' of github.com:duffcodester/digiquatics into staging
Assets.
Assets and fix sub request boolean to words.
Merge branch 'staging' of github.com:duffcodester/digiquatics into staging

Conflicts:
	app/views/sub_requests/my_sub_requests.html.erb
	public/assets/manifest-ee246bbd0cfd3fc2173c8d6434a6bbbb.json
Merge branch 'staging' of github.com:duffcodester/digiquatics into staging
Merge branch 'fix_sub_requests' of github.com:duffcodester/digiquatics into staging
Merge branch 'fix_sub_requests' of github.com:duffcodester/digiquatics into staging
fixing index
Merge branch 'fix_sub_requests' of github.com:duffcodester/digiquatics into fix_sub_requests
Merge branch 'fix_sub_requests' of github.com:duffcodester/digiquatics into staging