rm gitign
ugh
rm settings
rm giting
Merge branch 'public'
restore settings
remove sensitive info