modified:   config/media
	modified:   index.js
	modified:   quality
	modified:   start
Merge branch 'master' of https://github.com/lynchburg-college/Camera

Conflicts:
	config/media

	modified:   config/media