css fixes
adds coverage files for simplecov
merged beer_api branch
made some changes via the css files
removing the application.yml
adds friendly_id gem
fixing merge conflict and merging inception
added fonts folder with 4 files to reflect incorporating video.js
changed applicaiton.js to read application.js.erb since we incorporated video.js
video-js.swf file needed with vitals pasted inside this folder
updated controllers and models to use FriendlyId
video.js was copied from video.js github, and pasted into newly created video.js file which was made in app/assets/javascript
video-js.css was created in app assets and houses another copied and pasted file from github video.js
and finally, we have created a video folder with the actual video of what'll be on the layouts page
my brain is hurting
adding todo list for some on trackness ness's
nothing much changed. just getting ready to dive back into some polymorphic action. ja know
adding inordinate amounts of flavor here; I can't fit it all in
Merge branch 'css' into inception
gemfile changes