Merge branch 'master' of C:\OpenServer\domains\localhost\panchanga-riga with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Base