commit before rebase
ran rake assets