minor setups
sa
Merge branch 'dev' into chudix
general foundation out + header styling
side-nav styling
some stuff
changes logo
Merge branch 'chudix' of github.com:farfanoide/agalma into chudix
foundation buttons off + some sidebar
side changes
modifica rutas paginas
agrega posts
Merge branch 'dev'

Conflicts:
	.gitignore
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/foundation_and_overrides.scss
	app/assets/stylesheets/general.scss
	app/views/application/_search.html.erb
	db/seeds.rb
Merge branch 'master' of github.com:farfanoide/agalma

Conflicts:
	app/controllers/application_controller.rb
	db/schema.rb