aws updates
Merge branch 'master' of github.com:tongelja/work-nk_lc