Merge branch 'master' of github.com:StartupWeekend/startup-week-base
Adds configurable ribbon
Adds custom page template
Merge branch 'master' of github.com:StartupWeekend/startup-week-base
Makes the ribbon default to display
Merge branch 'master' of github.com:StartupWeekend/startup-week-base
Changes content_type_template to custom_page
Merge branch 'master' of github.com:StartupWeekend/startup-week-base
Fixes global editable fields
Fixes editable field declarations
Fixes html editable field formatting
Trying to get html rich text editor to display
Finalizes custom page template
Finalizes styles for custom page template
Adds main tag for consistent spacing
Fixes editable text fields again
Merge branch 'master' of github.com:StartupWeekend/startup-week-base

Conflicts:
	_assets/sass/_typography.scss
	app/views/pages/index.liquid
Updates rakefile with reset_repositories task
Removes ribbon hiding feature, adds priority stacking
Merge branch 'master' of github.com:StartupWeekend/startup-week-base