resolving conflicts.
Merge branch 'master' of https://github.com/prabodhak/credit-society.git
Adding master tables.