conflict resolution
Merge branch 'master' of https://github.com/d4t4king/aws-scripts