merge; 1
merge 2
merge 3
Added .gitignore files