Updated .gitignore
Merge.
Added nbproject to .gitignore.
Implemented ZT-like styles.
Merge branch 'v1' into v2