Updated .gitignore
Spring configuration
Merge branch 'master' of github.com:watersoft/meling