initial commit
Merge branch 'master' of https://github.com/Saprissa2010/tvhr

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/static_pages.css.scss
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
	config/application.rb
	config/routes.rb
	javascripts/foundation/foundation.orbit.js
	stylesheets/app.css
Local Updates