first commit
Merge branch 'master' of github.com:sumitnsit/wallet

Conflicts:
	config/database.yml