added gitignore file
resolve conflicts
take apurva's code
changes in database.yml
resolve conflicts
blank commit
notice
modified gitignore file