Updated Better Errors gem as it was giving segmentation faults
Merged conflicts probably because I don't know how to use git correctly in these situations
Merged conflicts