Adding database configuration and models erb
Merging