Added ds_store ignore
Merge branch 'master' of https://github.com/sankalpk/gelfand

Merged
deleted migrations
Removed the contact_id migrations because they caused a bug
Merge pull request #47 from cjwillia/master

deleted unnecessary migrations
Merge branch 'master' of https://github.com/sankalpk/gelfand
more migrations, it never ends
Merge pull request #49 from cjwillia/master

more migrations, it never ends
Merged Sethu's changes
Merge branch 'master' of https://github.com/sankalpk/gelfand into psethu-master
Merge branch 'master' of https://github.com/sankalpk/gelfand
Merge branch 'psethu-master'
Migrated database