end frontend
Merge branch 'master' of https://github.com/sg3des/yc

Conflicts:
	app/assets/images/hotels/star.png
	app/assets/images/index.mp4
	app/assets/javascripts/application.coffee
	app/assets/javascripts/application.js
	app/assets/javascripts/coffee
	app/assets/stylesheets/landing.css.scss
	app/controllers/landing_controller.rb
	app/views/landing/_main.html.slim
	app/views/landing/index.html.slim
	app/views/landing/page.html.slim
	yc.sql
	yc.sublime-workspace