Merge pull request #1 from keeronmarc/ari-branch

basic layout, needs more work, but now U have somthn to work with.
a few passing specs with unlimited beer generation power
cleaned up a little bit
attempting merge of BeerGeneration into master
stupid .DS_Store
add beer matching capability
joe and keeron collaboration on finding beers that match the users preferences
ficed some merge issues
Merge pull request #3 from keeronmarc/BeerMatcher

Please add this bros
merged the js file that was being bitchy
merging bitchy js