fixing dir
annoying merging changes
pulling merge
fix typo in .gitignore
add foundation