added assets for bourbon framework - generated welcome resource - added navigation bar
Added scrolling on welcome#index - added flatuikit pro assets for styling
Added bxslider for welcomes#index
users#index
seeds.rb edited
Added flatuikit pro
ui users#login users#sign_up
Added slider on users#index
slider on users#index
index.html and routes.rb edited
fixed merge conflicts
Added foundation icons
modification to the slider on show#user
fixing merge conflicts
merge conflicts fixed