cleaned project in preperation of lab3

old stuff is in folder oldstuff