First commit
Merge branch 'master' of github.com:RajRoR/avoinministerio

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/idea.rb
	app/views/ideas/show.html.haml