empezando
Merge branch 'master' of github.com:nestier/agalma

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb