update .gitignore with idea
using bootstrap create first page quickly, then begin modify css
try to copy a more fanshione page instead of mockup.html
resolve conflicts when merging new layout.
Merge branch 'site-layout'