add json response
start writing json response
merge
add importer.java
finish json reponse
resolve conflict in importer.java
Merge pull request #5 from samzhao88/develop

finish JSON reponse
test
add query and json representation of the query result
Merge branch 'develop' of https://github.com/FlightFinder/FlightFinder
into develop

Conflicts:
	FlightFinder/src/main/java/service/Controller.java
fix missing code
0.1 version, be able to query from Airport A to Airport B.
Also the result varibale is effective

Sample usage:

http://localhost:8080/query?origin=AAR&dest=AAL&results=10
0.1 version, be able to query from Airport A to Airport B.
Also the result varibale is effective

Sample usage:

http://localhost:8080/query?origin=AAR&dest=AAL&results=10
merge
fetch from upstream
Merge pull request #6 from samzhao88/develop

clean up controller.java, separate out DB_PATH in to Constant object.
fix DatetimeFormat problem
Update README.md
conflict resolved
Merge branch 'develop' of https://github.com/FlightFinder/FlightFinder
into develop

Conflicts:
	FlightFinder/src/main/java/service/Controller.java