bobbys project file
fixed project
project changes
fixed conflicts, removed old files from project