minor changes
Merge branch 'editing'
"syncing"
Conflicts:
	sinatra-skeleton-master/app/views/index.erb