Merging all changes between teresas folder and mine.