gitignore file
Merge branch 'master' of https://github.com/era-project/era-indicators.git
prepare for conflict psdiop
Signed-off-by: psdiop <psdiop@oired.vt.edu>
resolve conflict