changed parameter name in our JSON config file
'orders' structure has been combined with 'data

- all the bus orders inside ‘orders’ object is now inside the ‘data’
object. this way we can search for both in the same place.
- changed the ‘linha’ parameter inside the url request for ‘busca’.
this is the parameter that should be used to search for either bus line
and orders.
Merge branch 'node.js-dataGrabber'
added dash in the begging of each log line
moved snippet inside try catch block

- moved the part of the code that checks if the json file came with
only a message, inside the try catch block that parses this json to
object.
- fixed label for the syntax error that could happen when parsing that
json.
throwing away broken log lines when retrieving

- i substitute the log line that could not be parsed from the log file
by a string that has the message of the parse error found in that log
line.
Resolvendo conflitos

conflitos no dataGrabber.js
Merge branch 'cassiohg-master'