0000000000000000000000000000000000000000 a676925c11503f597faf9ddbd6574b4aadbff53d Sahil Gupta <sahilgupta5@hotmail.com> 1366673306 -0400	clone: from https://github.com/rlobo3/GTCarRentalDBProj.git
a676925c11503f597faf9ddbd6574b4aadbff53d 6510ffc6ccdce99774f0c165dbfda6f07461aeb3 Sahil Gupta <sahilgupta5@hotmail.com> 1366686318 -0400	pull --progress --prune: Fast-forward
6510ffc6ccdce99774f0c165dbfda6f07461aeb3 45c204eb7d752f875ae0898510e64b7f3921b88b Sahil Gupta <sahilgupta5@hotmail.com> 1366689869 -0400	reset: moving to origin
c24389de0943962b3eb01f7a4209ee24dd372aab 3e46c1cbc951e8c0b0b4ea8985c84bf33e88f0a0 Sahil Gupta <sahilgupta5@hotmail.com> 1366693849 -0400	commit: minor changes
8f1090ece6208b4686d2331cd15b82ca51b9e494 ec2573597d0f2abfff55be0696108add468b529b Sahil Gupta <sahilgupta5@hotmail.com> 1366710270 -0400	rebase finished: refs/heads/master onto 90d9ab3be3506e0906456368b1d5eda319d7ac06
ec2573597d0f2abfff55be0696108add468b529b cac5193aec97f6014e0694cb1b11a297b96f5bb0 Sahil Gupta <sahilgupta5@hotmail.com> 1366710329 -0400	commit (amend): MemberInfo Panel Done
cac5193aec97f6014e0694cb1b11a297b96f5bb0 ec2573597d0f2abfff55be0696108add468b529b Sahil Gupta <sahilgupta5@hotmail.com> 1366710580 -0400	rebase finished: refs/heads/master onto ec2573597d0f2abfff55be0696108add468b529b
ec2573597d0f2abfff55be0696108add468b529b f3d2863b13145cfe360b4e80c645177ca4b8d5f8 Sahil Gupta <sahilgupta5@hotmail.com> 1366711021 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
f3d2863b13145cfe360b4e80c645177ca4b8d5f8 9b154649039c08c3f3d1b9cab1d67962a1f39491 Sahil Gupta <sahilgupta5@hotmail.com> 1366712964 -0400	commit: Minor changes
9b154649039c08c3f3d1b9cab1d67962a1f39491 624148dbcc975be3a07e413322b7d2fe7f211dab Sahil Gupta <sahilgupta5@hotmail.com> 1366715749 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
624148dbcc975be3a07e413322b7d2fe7f211dab c7bb5fd96c322fc20ff3b6f74a366f32ecd7bce8 Sahil Gupta <sahilgupta5@hotmail.com> 1366715785 -0400	commit: Plan Detail Panel completed
c7bb5fd96c322fc20ff3b6f74a366f32ecd7bce8 0b4894326e53028d943e62d772e530008e127178 Sahil Gupta <sahilgupta5@hotmail.com> 1366717446 -0400	commit: Fixed SQL Statement error. Error was due to not using rs.next() in while loop in ResultSet. Column is set to -1 so while next makes it 0 and then it works. Still some issues with GUI(actually not showing at all).
0b4894326e53028d943e62d772e530008e127178 531241be570e2a8697e15e2107ac39fef4ed1892 Sahil Gupta <sahilgupta5@hotmail.com> 1366742470 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
531241be570e2a8697e15e2107ac39fef4ed1892 33e412afa5f180d94f99fd916d7e0ec6f2ce8a82 Sahil Gupta <sahilgupta5@hotmail.com> 1366748865 -0400	commit: RentCarPanel GUI. Making search button next integration for reservation
33e412afa5f180d94f99fd916d7e0ec6f2ce8a82 a17b1aea9ead209b01c5c79cc96d62b3d1ee8b39 Sahil Gupta <sahilgupta5@hotmail.com> 1366750096 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Merge made by resolve.
a17b1aea9ead209b01c5c79cc96d62b3d1ee8b39 25e83a648eb32fbf24c43ab58d5dfa55f8f1c383 Sahil Gupta <sahilgupta5@hotmail.com> 1366752226 -0400	commit: Rent Car Panel mostly done with search. just waiting on one thing to finish
25e83a648eb32fbf24c43ab58d5dfa55f8f1c383 98979f476b56dcfb959badeb82e55c6c784b6382 Sahil Gupta <sahilgupta5@hotmail.com> 1366756452 -0400	commit: Done with CarAvailPanel and RentCarPanel. ManageCarsPanel coming soon in 20 minutes!
98979f476b56dcfb959badeb82e55c6c784b6382 d4dff6f8fde973c7c0ba78620afc994e6e862310 Sahil Gupta <sahilgupta5@hotmail.com> 1366758961 -0400	commit: Car Avail Panel done, Manage Cars GUI only Done, Rent Car Panel Done
d4dff6f8fde973c7c0ba78620afc994e6e862310 7805a5149ea7f5e6871f54267e32e09bc658d42d Sahil Gupta <sahilgupta5@hotmail.com> 1366760904 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
7805a5149ea7f5e6871f54267e32e09bc658d42d 2056b21600ae7ab750ee72a7c4a669fc1167365f Sahil Gupta <sahilgupta5@hotmail.com> 1366769926 -0400	reset: moving to origin
2056b21600ae7ab750ee72a7c4a669fc1167365f fc2bfa6934a1974c8d03dbb77f2d9caf131ba1cc Sahil Gupta <sahilgupta5@hotmail.com> 1366770405 -0400	commit: car availability panel, admin revenue panel worked on
fc2bfa6934a1974c8d03dbb77f2d9caf131ba1cc 5f849dc9934343111f2e996845dfd870576dcada Sahil Gupta <sahilgupta5@hotmail.com> 1366772739 -0400	commit: All the reports are done.
5f849dc9934343111f2e996845dfd870576dcada 71292c3aa85f377a373e915bb1d4701dcbe1d3ee Sahil Gupta <sahilgupta5@hotmail.com> 1366772950 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
71292c3aa85f377a373e915bb1d4701dcbe1d3ee b32e31b0976801cf9aa0e5c24c559a093595d304 Sahil Gupta <sahilgupta5@hotmail.com> 1366776661 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
b32e31b0976801cf9aa0e5c24c559a093595d304 99e28a9710039135c0f4d980bb8ffc358000f8ff Sahil Gupta <sahilgupta5@hotmail.com> 1366777112 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
99e28a9710039135c0f4d980bb8ffc358000f8ff 036dbf5594e06db72ecca340bdcf45a1375b7882 Sahil Gupta <sahilgupta5@hotmail.com> 1366784036 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
036dbf5594e06db72ecca340bdcf45a1375b7882 5d9fe75fc7087948a901753604a686cc278b02cc Sahil Gupta <sahilgupta5@hotmail.com> 1366784074 -0400	commit: Fixed rentCarPanelError
5d9fe75fc7087948a901753604a686cc278b02cc 650b13d75776030c6ffa52ef6f66eb8291281103 Sahil Gupta <sahilgupta5@hotmail.com> 1366788393 -0400	commit: RentInfoPanel Done.
650b13d75776030c6ffa52ef6f66eb8291281103 063bdb7f2bf7746547393617dedf9d06e2febfa0 Sahil Gupta <sahilgupta5@hotmail.com> 1366788495 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Merge made by resolve.
5618cfeeecadf7299523e125a682ccdad009cd15 1bae96dd67825c281a29e202c7e222dd388508d2 Sahil Gupta <sahilgupta5@hotmail.com> 1366792048 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
1bae96dd67825c281a29e202c7e222dd388508d2 3617e375bce898b9b19d1d6a89213e15ee504453 Sahil Gupta <sahilgupta5@hotmail.com> 1366792401 -0400	commit: RentChangePanel is done!
3617e375bce898b9b19d1d6a89213e15ee504453 01c548b8e104e0af300e8fbf7523673154c72e43 Sahil Gupta <sahilgupta5@hotmail.com> 1366794485 -0400	commit: Rent Change Panel Fully Done!
01c548b8e104e0af300e8fbf7523673154c72e43 144b4f120ff8614b1768a0aad667b0d0c691bd69 Sahil Gupta <sahilgupta5@hotmail.com> 1366795203 -0400	commit: minor stuff
144b4f120ff8614b1768a0aad667b0d0c691bd69 de6f579a31ed2dddb70ed0c13b7e5fdee3cc5b7d Sahil Gupta <sahilgupta5@hotmail.com> 1366800624 -0400	commit: rentCarPanel working. Error handling added. Still need to check car availability and whether fetching stuff correctly or not.
de6f579a31ed2dddb70ed0c13b7e5fdee3cc5b7d a08fe0b094d926bdf78d0f0922b4a3a828e7f3dc Sahil Gupta <sahilgupta5@hotmail.com> 1366836329 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
a08fe0b094d926bdf78d0f0922b4a3a828e7f3dc 1f1216c5ba465bd651a80e6b56e01696f2000747 Sahil Gupta <sahilgupta5@hotmail.com> 1366838572 -0400	commit: number format exception error handling
1f1216c5ba465bd651a80e6b56e01696f2000747 b51018424bb66aed526625a5f3f28d107b0b6c9a Sahil Gupta <sahilgupta5@hotmail.com> 1366840342 -0400	commit: fixed car availabilities reserve button.
b51018424bb66aed526625a5f3f28d107b0b6c9a 4ace95c348f8d6ba641bd48eb7fbda0e17e86a43 Sahil Gupta <sahilgupta5@hotmail.com> 1366840904 -0400	commit: fixed the reserve button on car availability panel.
4ace95c348f8d6ba641bd48eb7fbda0e17e86a43 653919f525f0f6a65c272ac4a13c44dac6dcf615 Sahil Gupta <sahilgupta5@hotmail.com> 1366842080 -0400	commit: fixed a few errors in mainteRequestPanel.Still getting sql exception for insertion. gonna try later
653919f525f0f6a65c272ac4a13c44dac6dcf615 037c6e080bb4c8340a58440739e31e552112854f Sahil Gupta <sahilgupta5@hotmail.com> 1366844507 -0400	commit: manage cars panel GUI fully functional. buttons still need to be added
037c6e080bb4c8340a58440739e31e552112854f 18b0cf1c426e811936e7dc85705d076f0ca2b725 Sahil Gupta <sahilgupta5@hotmail.com> 1366844738 -0400	commit: Removed all the trivial warnings
18b0cf1c426e811936e7dc85705d076f0ca2b725 5f8304ebc457df9a95a1b3a648fe4bb7e7b57332 Sahil Gupta <sahilgupta5@hotmail.com> 1366853546 -0400	commit: RentChangePanel GUI done.
5f8304ebc457df9a95a1b3a648fe4bb7e7b57332 c658796b2976790c1bc594364a73e2bd256f43a7 Sahil Gupta <sahilgupta5@hotmail.com> 1366866595 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
c658796b2976790c1bc594364a73e2bd256f43a7 c0a3b30f5523113520d85e49e2745ea73afd83c0 Sahil Gupta <sahilgupta5@hotmail.com> 1366868389 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
c0a3b30f5523113520d85e49e2745ea73afd83c0 04affdb901dc0d2c260d6f311e21cb67cb30550b Sahil Gupta <sahilgupta5@hotmail.com> 1366868447 -0400	commit: RentChangePanel GUI Fixed
04affdb901dc0d2c260d6f311e21cb67cb30550b 6e53276cf1a008596d9adfbdaea85a9d5053c707 Sahil Gupta <sahilgupta5@hotmail.com> 1366871277 -0400	commit: creditCard issue solved
6e53276cf1a008596d9adfbdaea85a9d5053c707 2eceecf04b3228bc9234f93dc0e914917bc9d8ce Sahil Gupta <sahilgupta5@hotmail.com> 1366873534 -0400	commit: fixed time issue in rent car panel
0a7cf7c2083dd4246bfefc9c398c02b10f623666 25f23ab10b101dc8bf52bdba7c0987d53b4a30f9 Sahil Gupta <sahilgupta5@hotmail.com> 1366882896 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
25f23ab10b101dc8bf52bdba7c0987d53b4a30f9 92b6bb5d59e28a613850e73a9cf0ca990f0ae86c Sahil Gupta <sahilgupta5@hotmail.com> 1366887680 -0400	commit: Manage Car Panel
92b6bb5d59e28a613850e73a9cf0ca990f0ae86c 125448e65c88e6b2c260073b4ab92cbaa0c58d20 Sahil Gupta <sahilgupta5@hotmail.com> 1366890759 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
125448e65c88e6b2c260073b4ab92cbaa0c58d20 cffe8c3f100e9f068b1f2d641ebbdf9d5cb90044 Sahil Gupta <sahilgupta5@hotmail.com> 1366893494 -0400	commit: fixes
cffe8c3f100e9f068b1f2d641ebbdf9d5cb90044 b7456406927f2e7b505b2066710c567f0946fd58 Sahil Gupta <sahilgupta5@hotmail.com> 1366893539 -0400	rebase finished: refs/heads/master onto e73c7aee19db3914f6f1f1223f0bf6dff9ac9841
b7456406927f2e7b505b2066710c567f0946fd58 594c88b1bc03dbb62e31f715567a0df596f8adf8 Sahil Gupta <sahilgupta5@hotmail.com> 1366915730 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
594c88b1bc03dbb62e31f715567a0df596f8adf8 c682b36f4b347f3432472fe5f1c13192ba73aa94 Sahil Gupta <sahilgupta5@hotmail.com> 1366916343 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
c682b36f4b347f3432472fe5f1c13192ba73aa94 c1634b278153f7541a945ecbe8f052d39fd15655 Sahil Gupta <sahilgupta5@hotmail.com> 1366916368 -0400	commit: minor fixes
c1634b278153f7541a945ecbe8f052d39fd15655 512272f276262e2720b68094b001907e68867056 Sahil Gupta <sahilgupta5@hotmail.com> 1366935800 -0400	commit: Changes we made to everything in 3 hours :)
512272f276262e2720b68094b001907e68867056 a6cb090aa2c4947213cc7c4fe7c3461acc024103 Sahil Gupta <sahilgupta5@hotmail.com> 1366956735 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
a6cb090aa2c4947213cc7c4fe7c3461acc024103 6aef6b8b18472679400040057fcfcd912b3afc21 Sahil Gupta <sahilgupta5@hotmail.com> 1366960540 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
6aef6b8b18472679400040057fcfcd912b3afc21 0318cc3eef2c8d5fc022b5258c239bfbd8f0fabb Sahil Gupta <sahilgupta5@hotmail.com> 1366960710 -0400	commit: some minor stuff
0318cc3eef2c8d5fc022b5258c239bfbd8f0fabb d14e2dcc5fa21ece294d0b4c3bc29b4123db65b6 Sahil Gupta <sahilgupta5@hotmail.com> 1366961740 -0400	commit: minor fix
d14e2dcc5fa21ece294d0b4c3bc29b4123db65b6 3bba3b962d110c26146bd803baa5eaddf24456e8 Sahil Gupta <sahilgupta5@hotmail.com> 1366993318 -0400	merge branch 'master' of https://github.com/rlobo3/GTCarRentalDBProj.git: Fast-forward
3bba3b962d110c26146bd803baa5eaddf24456e8 6d158787acc572a68d00fda04f9b1f43b70147db Sahil Gupta <sahilgupta5@hotmail.com> 1366993344 -0400	commit: manage cars done
6d158787acc572a68d00fda04f9b1f43b70147db 73f6b2ab66832e36b1843b938f81e4a013069a7f Sahil Gupta <sahilgupta5@hotmail.com> 1367051321 -0400	commit: Commented and arranged the whole code for future use.
