adding gitignore
Moved and updated to latest in gh-pages
Added default styles
Merge branch 'master' into gh-pages

Conflicts:
	assets/sass/_menu.scss
	config.rb