adding combine
syncing
Merge branch 'master' of github.com:aviforever/pa3