Forcing github to accept my branching model
Merge branch 'er-dev' into development