Merged changes from site. Added .gitignore