added vim files to gitignore
fixed #5
merged
Merge branch 'master' into gh-pages

Conflicts:
	styles/main.css