Added .settings to .gitignore
Merge branch 'master' of ssh://git@github.com/Widar91/cloud-computing-project.git
Added SLF4j, changed scheduling