Merged all files together for handin
Edited Data