initial commit.
Merge branch 'master' of https://github.com/hantsy/spring-conference