Adding to gitignore
merging from upstream
Merge branch 'master' of github.com:openmrs/openmrs-module-reporting

Conflicts:
	.gitignore
REPORT-487 - Mapping parameters to expressions should support numeric addition and subtraction
REPORT-487 - Mapping parameters to expressions should support numeric addition and subtraction
REPORT-487 - Mapping parameters to expressions should support numeric addition and subtraction
Merge pull request #27 from djazayeri/REPORT-487

REPORT-487 - Mapping parameters to expressions should support numeric addition and subtraction