initial commit from server
Merge branch 'master' of https://github.com/dandaniel/testing-aws