Merge remote-tracking branch 'r-spacex/master'

Author: waterskier2007

README.md

@@ -50,11 +50,11 @@ GET https://api.spacexdata.com/launches/upcoming
 ```
 Get past launches by year
 ```http
-GET https://api.spacexdata.com/launches/year=2017
+GET https://api.spacexdata.com/launches?year=2017
 ```
 Get past launches in a date range
 ```http
-GET https://api.spacexdata.com/launches/from=2011-01-20/to=2017-05-25
+GET https://api.spacexdata.com/launches?from=2011-01-20&to=2017-05-25
 ```
 
 ## Launch info by serial #'s

app.rb

@@ -215,7 +215,7 @@ def hash_merge *hashes
 end
 
 # Gets all launches in a date range
-get '/launches/from=:start/to=:final' do
+get '/launches/from=:start&to=:final' do
   content_type :json
   start = params['start']
   final = params['final']