updated gemfile and routes
fixed conflict
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
removed logins route
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
Merge branch 'development' of github.com:BaobabHealthTrust/DDE2 into development
added gem
by national id