added loading bar
working color swatches with click to pick functionality
Merge pull request #37 from CandidKilsborne/continuing-camera-compatibility

Continuing camera compatibility