Test commit, kindly move along
Removes test commit
Merge branch 'master' of github.com:StartupWeekend/startup-week-denver
Merge branch 'master' of github.com:StartupWeekend/startup-week-denver
Initial site configuration
Merge branch 'master' of github.com:StartupWeekend/startup-week-denver

Conflicts:
	config/site.yml
Initial site configuration
Fixes broken site.yml
Merge branch 'master' of github.com:StartupWeekend/startup-week-denver

Conflicts:
	app/views/pages/index.liquid
Initial site configuration
Merge branch 'master' of github.com:StartupWeekend/startup-week-denver

Conflicts:
	app/views/pages/index.liquid
Merge branch 'master' of github.com:StartupWeekend/startup-week-denver
Merge branch 'master' of github.com:StartupWeekend/startup-week-denver