Added everything
Merge origin/master