First Commit
Merge branch 'master' into gh-pages

Conflicts:
	index.html

	new file:   fonts/glyphicons-halflings-regular.woff
	modified:   index.html
	new file:   script/holder.js
	new file:   script/html5shiv.js
	new file:   script/respond.min.js
	new file:   style/bootstrap-theme.css
	new file:   style/bootstrap.css
	new file:   style/offcanvas.css
	new file:   style/social-buttons.css
Trying to get back in sync