update files
Merge https://github.com/ironheartbj18/scratchlaravel