capybara removed for upload
capybara removed for upload
updated key info
fix heroku
ahh
asf
gemlock
fix conflicts
conflicts
faker fix
asf
asf
too many style sheets
asdf
conflicts
conflicts
conflicts
asdf
fixed conflicts
fixed conflicts