updating all local files
added untracked files
updating merge of work to home machine