Began refactoring GenreCalculator spec
Minor wording changes to spec descriptions
Merge branch 'master' into genre_calc_spec_refactor
changed js so that multiple invalid postal codes wouldn't keep appending the same alert
Altered the search method to sample 20 random results before sorting

Wrote a spec to ensure we are limiting our return to 20 beers
changed location lookup results styling
Merge pull request #131 from fence-lizards-2014/truncate_beer_results

Altered the search method to sample 20 random results before sorting
got rid of random debugger in master
Merge pull request #128 from fence-lizards-2014/genre_calc_spec_refactor

Genre calc spec refactored
Merge pull request #134 from fence-lizards-2014/random_debugger

got rid of random debugger in master
Change zipcode to postal code
Precompile images just like fonts in the asset pipeline
trying adjustments to the javascript
Made the default non-image appear by putting it in the Public folder

It wasn't appearing and we had struggled with the asset pipeline for long enough that we
decided to not bother and just put it in publick.
Merge pull request #133 from fence-lizards-2014/location_styling

Location styling
Merge branch 'master' into image_precompile locally to pull in

Will be pulling up on github. Tried to rebase and that didn't work.
Merge branch 'image_precompile' of https://github.com/fence-lizards-2014/amber into image_precompile

There wasn't an apparent conflict...not sure what the issue was.
Conflicts:
	app/assets/javascripts/views/view.js