Initial Commit
Merge branch 'master' of https://github.com/budparr/jekyll-starter

Conflicts:
	_includes/nav/nav-side.html
	_layouts/default.html