test commit from nitrous.io and addition of about route
coflicts managed