Merge pull request #1 from algotechgroup/master

Aerodock
removed comments from tablecreationsql.txt
Merge branch 'master' of https://github.com/evanrichards/Aerodock
Merge pull request #2 from algotechgroup/master

Tset
Swapped graphing software for google charts
Merge pull request #2 from jbaird42/master

added delete flight
Added hover on charts
Merge pull request #3 from jbaird42/master

delete flight now deletes logs too!
Changed to Implicit Aircraft
Merge pull request #3 from algotechgroup/master

Update
Flight duration

Added duration column to flights table - duration of flight in seconds

Added logic to FlightsController, Flight Model, and Log Model to
calculate duration
Change responsibilities

Oneill working on Flight Flagging
Merge pull request #4 from infomodity/master

Flight duration
Added users back to TableCreationSQL.txt
Merge pull request #5 from jbaird42/master

added add() to Users
Merge pull request #6 from speedaddict81/master

Change responsibilities
Changes
Merge commit
Merge
removed pr statement