Ignore logs folder
Ignore file exclusive for aloja-web
README.md TravisCI build status point to master
Correct permissions for www-data user
Merge remote-tracking branch 'origin/master'
Allow passwordless SSH on the vagrant machine
Execute benchmarks on the vagrant machine
Merge branch 'master' of github.com:Aloja/aloja into bestconfig_screen
Bug fix