'merge'
landing
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/landing.css.sass
	app/assets/stylesheets/landing/bootstrap_lightbox.css
	app/assets/stylesheets/landing/bootstrap_style.css
	app/assets/stylesheets/landing/fonts.css
	app/assets/stylesheets/landing/jquery.cirliful.css
	app/assets/stylesheets/landing/lightbox.css
	app/views/landing/index.html.slim
	app/views/layouts/landing.html.slim
landing styles