initial commit
rm local props
cleanup
Merge remote-tracking branch 'origin/master'