Merge remote-tracking branch 'brian/master'
Merge remote-tracking branch 'brian/master'
remove files committed in error