Big Revamp and Stuff
Merged the Conflict of project.blade.php