fix navbar again
update gemfile for heroku
update gemfile for ruby 2.0
fix shopify initializer for heroku
fix secret token for heroku
remove precompiled assets
add viewport code
featured projects and menu changes
filter shop by categories
rename products partial
remove references to old product slide partial
make sorting more friendly for categories
get shop looking nice with same thumbs
add admin link
make all product boxes same size
add product show page`
change ellipsis
get up to date and fix navbar
Merge branch 'master' of github.com:jakesorce/chad-hydro

Conflicts:
	Gemfile.lock
	app/assets/javascripts/base.js.coffee
	app/assets/stylesheets/app.css.scss
	app/assets/stylesheets/shop.css.scss
	app/controllers/home_controller.rb
	app/controllers/shop_controller.rb
	app/views/layouts/_header.html.haml
	app/views/layouts/application.html.haml
	app/views/shared/_about.html.haml
	app/views/shop/_products.html.haml
	app/views/shop/index.html.haml
	config/routes.rb