Merged some changes from on my computer with changes that I did on my laptop.