before pull
Merge branch 'master' of github.com:Grapheme/optospot-new
after pull