Commit last changes, merge everything down to master branch, work all at once.