update css
Merge branch 'master' into gh-pages

Conflicts:
	sass/main.scss
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
added vim files to gitignore
fixed #5
merged