Initial Commit
prueba
Organizando javascripts, poniendo layouts
Merge branch 'master' of https://github.com/Jangfei/Sistema-de-encuestas

Conflicts:
	Gemfile.lock
	db/schema.rb