test
bs
Merge branch 'Development' into Kevins-branch
made variables that will transfer to database. Made a few GUI's for options
Fixed Merge
Merged into kevins' branch
Merge branch 'Kevins-branch' of https://github.com/hall9/Air-Traffic-Control into Kevins-branch
change
Changed create user
Merge Development
Meged and cleaned up the project
added objects and connected interfaces
Added stuff
Merge branch 'Kevins-branch' into Development

Conflicts:
	Flight Simulator/src/flight/simulator/interfaces/AdminView.form
	Flight Simulator/src/flight/simulator/interfaces/AdminView.java
	Flight Simulator/src/flight/simulator/interfaces/LogIn.form
	Flight Simulator/src/flight/simulator/interfaces/LogIn.java
Made Changes