really bad commit message
Merge https://github.com/COMP2404/RepoYourCar
editied readme, worked on next button: merge
Merge https://github.com/COMP2404/RepoYourCar

Conflicts:
	View/AppManager.cpp
trying to fix my repo. fuckme
Merge https://github.com/COMP2404/RepoYourCar

Conflicts:
	View/AppManager.cpp
	View/WindowApp.h
changed A5 package to makefile
Merge https://github.com/COMP2404/RepoYourCar

Conflicts:
	View/WindowApp.cpp
Merge https://github.com/COMP2404/RepoYourCar
Only lets you edit pending
Merge https://github.com/COMP2404/RepoYourCar

Conflicts:
	View/AdminWindow.cpp
merge
Merge https://github.com/COMP2404/RepoYourCar

Conflicts:
	View/AppManager.cpp
FINAL VERSION OF THIS PROJECT