New DB
Merge branch 'master' of github.com:beryste/infinity-trip
Merge branch 'master' of github.com:beryste/infinity-trip
Working under errorMessages