modify layout & css
modify .gitignore
merge from dz1984
ignore
fix conflict
Merge pull request #15 from solring/master

Change layout & css