Merge branch 'master' into stage
updating gitignore
Merge branch 'stage'
adding rollup account