git tracking changes
Merge branch 'master' of https://github.com/BrwnSuperman/PluFund

Conflicts:
	.idea/catarse-master.iml
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/vcs.xml
	.idea/workspace.xml
	config/database.yml
	log/development.log