gitignore added
Merge branch 'gh-pages'
added
added
add
Merge branch 'master' into gh-pages

Conflicts:
	_includes/readme.html
	_site/assets/fonts/fonts.css
	_site/assets/fonts/oxygen-sans-bold-webfont.eot
	_site/assets/fonts/oxygen-sans-bold-webfont.ttf
	_site/assets/fonts/oxygen-sans-bold-webfont.woff
	_site/index.html
	assets/fonts/fonts.css
	assets/fonts/oxygen-sans-bold-webfont.eot
	assets/fonts/oxygen-sans-bold-webfont.ttf
	assets/fonts/oxygen-sans-bold-webfont.woff