rebaseandsqua.sh

Rebase and Squash