Changes and styles

Signed-off-by: Jesús Antonio García Valadez <zerovamp@hotmail.com>
Merge branch 'master' of https://github.com/alfabrad/tuFotoConElGuero

Signed-off-by: Jesús Antonio García Valadez <zerovamp@hotmail.com>

Conflicts:
	config.codekit
	css/main.css
	css/main.css.map
	css/scss/.sass-cache/012959bf81043657dbbcb5ce2439b063823dfd5c/_gradient-positions-parser.scssc
	css/scss/.sass-cache/012959bf81043657dbbcb5ce2439b063823dfd5c/_linear-positions-parser.scssc
	css/scss/.sass-cache/012959bf81043657dbbcb5ce2439b063823dfd5c/_radial-arg-parser.scssc
	css/scss/.sass-cache/012959bf81043657dbbcb5ce2439b063823dfd5c/_radial-positions-parser.scssc
	css/scss/.sass-cache/012959bf81043657dbbcb5ce2439b063823dfd5c/_render-gradients.scssc
	css/scss/.sass-cache/012959bf81043657dbbcb5ce2439b063823dfd5c/_shape-size-stripper.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_assign.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_flex-grid.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_golden-ratio.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_grid-width.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_modular-scale.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_px-to-em.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_strip-units.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_tint-shade.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_transition-property-name.scssc
	css/scss/.sass-cache/19f56527ac991d73c9cef2c34ba2b9e3b2d2c3f5/_unpack.scssc
	css/scss/.sass-cache/1fbb2f5f0e3486167b6c0f0d1609d58d6271516e/_bourbon-deprecated-upcoming.scssc
	css/scss/.sass-cache/1fbb2f5f0e3486167b6c0f0d1609d58d6271516e/_bourbon.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_animation.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_appearance.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_backface-visibility.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_background-image.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_background.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_border-image.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_border-radius.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_box-sizing.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_calc.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_columns.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_flex-box.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_font-face.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_hidpi-media-query.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_hyphens.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_image-rendering.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_keyframes.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_linear-gradient.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_perspective.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_placeholder.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_radial-gradient.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_transform.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_transition.scssc
	css/scss/.sass-cache/45405d93d4b46413c4001f2b4d4765ba4abf4225/_user-select.scssc
	css/scss/.sass-cache/7c59900cb12e151cdb03b00f3d29e2a7c48b4736/event.scssc
	css/scss/.sass-cache/7c59900cb12e151cdb03b00f3d29e2a7c48b4736/eventos.scssc
	css/scss/.sass-cache/7c59900cb12e151cdb03b00f3d29e2a7c48b4736/jquery-ui-1.10.4.custom.scssc
	css/scss/.sass-cache/7c59900cb12e151cdb03b00f3d29e2a7c48b4736/main.scssc
	css/scss/.sass-cache/7c59900cb12e151cdb03b00f3d29e2a7c48b4736/menu-vertical.scssc
	css/scss/.sass-cache/7c59900cb12e151cdb03b00f3d29e2a7c48b4736/navigation.scssc
	css/scss/.sass-cache/7c59900cb12e151cdb03b00f3d29e2a7c48b4736/normalize.min.scssc
	css/scss/.sass-cache/7c59900cb12e151cdb03b00f3d29e2a7c48b4736/shadowbox.scssc
	css/scss/.sass-cache/7c59900cb12e151cdb03b00f3d29e2a7c48b4736/site.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_button.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_clearfix.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_directional-values.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_ellipsis.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_font-family.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_hide-text.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_html5-input-types.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_position.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_prefixer.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_retina-image.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_size.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_timing-functions.scssc
	css/scss/.sass-cache/9a8580a8b87ccb3ebfce0c830c2ae8ff421ad686/_triangle.scssc
	css/scss/.sass-cache/bb5e4e3907049e9ce13760c6f319284c055cd117/_prefixer.scssc
	css/scss/.sass-cache/bb5e4e3907049e9ce13760c6f319284c055cd117/_px-to-em.scssc
	css/scss/event.scss
	css/scss/eventos.scss