SECOND commit

Stanford Course ShutterBug initial
Merge branch 'master' into feature/pricesort
Merge branch 'feature/pricesort'