Total Merging, updated makefiles, project_tester working
TODO: make ex6 and 7 launchers like ex4, ex5, ex8, upload ex12