es muy tarde, ni idea
agrega controlador abstracto para layout en admin
modifica parciales compartidos
modifica imagenes y agrena normalize.css
giladas
agrega paginas
adds ckeditor
adds content.css
ckeditor test for heroku
ckeditor test for heroku
some more heroku test
Merge branch 'master' of heroku.com:agalma-dev

Conflicts:
	config/application.rb
pages now on frontend except for crud
general routes fixes
fixes routes for branches a760f027d40cb16ece288938c6c08aff3eb63841
takes users to the backend
adds seeds for some pages, implements navigation
adds email and address to branches
updates application/branches/show
Merge branch 'master' into dev

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/frontend/shared/_side_nav.html.erb