added AWS rules for gitignore
Merge branch 'dev'