Added an singleton pattern to database - uncomment to proceed
Merge remote-tracking branch 'origin/master'