Commiting before merging
Fixed merge conflicts
Worked on framebuffers, came up with a plan for the future