githubteacher/merge-strategies — pull request #4 by githubteacher (2014-11-17 20:25:58+00:00)
Title: Finish integration 01

:warning: Requires lead architect sign off and deployment team's attention.