Remove old filter bar.  Add dynamic additions to sort bar based on filter selection.
Merge branch 'master' of https://github.com/arbarr3/GSMM_Website

Conflicts:
	app/assets/data/filters.json
	app/assets/listings.html
	app/scripts/listings.coffee
	app/styles/listings.styl
	app/styles/mainPage.styl
	app/views/templates/filter.hbs
	node_modules/clean-css-brunch/node_modules/.bin/cake
	node_modules/clean-css-brunch/node_modules/.bin/cleancss
	node_modules/clean-css-brunch/node_modules/.bin/coffee
	node_modules/clean-css-brunch/node_modules/clean-css/bin/cleancss
	node_modules/clean-css-brunch/node_modules/clean-css/node_modules/optimist/test/_/bin.js
	node_modules/clean-css-brunch/node_modules/clean-css/test/data/960-min.css
	node_modules/clean-css-brunch/node_modules/clean-css/test/data/960.css
	node_modules/clean-css-brunch/node_modules/coffee-script/bin/cake
	node_modules/clean-css-brunch/node_modules/coffee-script/bin/coffee
	node_modules/clean-css-brunch/node_modules/coffee-script/lib/coffee-script/parser.js
	node_modules/coffee-script-brunch/node_modules/.bin/cake
	node_modules/coffee-script-brunch/node_modules/.bin/coffee
	node_modules/coffee-script-brunch/node_modules/coffee-script/bin/cake
	node_modules/coffee-script-brunch/node_modules/coffee-script/bin/coffee
	node_modules/coffee-script-brunch/node_modules/coffee-script/lib/coffee-script/parser.js
	node_modules/handlebars-brunch/node_modules/.bin/cake
	node_modules/handlebars-brunch/node_modules/.bin/coffee
	node_modules/handlebars-brunch/node_modules/.bin/handlebars
	node_modules/handlebars-brunch/node_modules/coffee-script/bin/cake
	node_modules/handlebars-brunch/node_modules/coffee-script/bin/coffee
	node_modules/handlebars-brunch/node_modules/coffee-script/lib/coffee-script/parser.js
	node_modules/handlebars-brunch/node_modules/handlebars/bin/handlebars
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/.bin/uglifyjs
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/optimist/test/_/bin.js
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/bin/uglifyjs
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/test/beautify.js
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/test/testparser.js
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/test/unit/compress/test/const.js
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/test/unit/compress/test/if.js
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/test/unit/compress/test/ifreturn.js
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/test/unit/compress/test/var.js
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/tmp/app.js
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/tmp/embed-tokens.js
	node_modules/handlebars-brunch/node_modules/handlebars/node_modules/uglify-js/tmp/test.js
	node_modules/sinon-chai/LICENSE.txt
	node_modules/sinon-chai/README.md
	node_modules/sinon-chai/lib/sinon-chai.js
	node_modules/stylus-brunch/node_modules/.bin/cake
	node_modules/stylus-brunch/node_modules/.bin/coffee
	node_modules/stylus-brunch/node_modules/.bin/stylus
	node_modules/stylus-brunch/node_modules/coffee-script/bin/cake
	node_modules/stylus-brunch/node_modules/coffee-script/bin/coffee
	node_modules/stylus-brunch/node_modules/coffee-script/lib/coffee-script/parser.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/index.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/chainsaw/index.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/chainsaw/node_modules/traverse/examples/json.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/chainsaw/node_modules/traverse/examples/leaves.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/chainsaw/node_modules/traverse/examples/negative.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/chainsaw/node_modules/traverse/examples/stringify.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/chainsaw/node_modules/traverse/index.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/hashish/node_modules/traverse/examples/json.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/hashish/node_modules/traverse/examples/leaves.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/hashish/node_modules/traverse/examples/negative.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/hashish/node_modules/traverse/examples/scrub.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/seq/node_modules/hashish/node_modules/traverse/examples/stringify.js
	node_modules/stylus-brunch/node_modules/node-sprite/node_modules/watch/package.json
	node_modules/stylus-brunch/node_modules/stylus/bin/stylus
	node_modules/uglify-js-brunch/node_modules/uglify-js/test/unit/compress/test/const.js
	node_modules/uglify-js-brunch/node_modules/uglify-js/test/unit/compress/test/if.js
	node_modules/uglify-js-brunch/node_modules/uglify-js/test/unit/compress/test/ifreturn.js
	node_modules/uglify-js-brunch/node_modules/uglify-js/test/unit/compress/test/var.js
	public/data/filters.json
	public/javascripts/app.js
	public/javascripts/vendor.js
	public/listings.html
	public/stylesheets/app.css
	vendor/scripts/jquery-1.8.3.min.js