merging in all of abrahams changes
ignore bin and obj subfolders
backing up everything so far