Separated Quiz files into their own library
Conflict Resolution
Fixed merge conflict