added dependencies for cucumber, capybara and database cleaner. refactored step definition to new syntax
refactored 'web_steps.rb'
Merge pull request #2 from tochman/master

BDD testing framework set-up
worked on some views
fixed Gemfile
added boostrap files
resolved merge error in Gemfile.lock
fixed merge issues
vm swap
new bootstrap
haml works
changes
fixed the javascript
Updated Gemfile
Merge branch 'master' of https://github.com/kgoodwill/bubhub
navbar partial created
added content for join bike share page
moved join bike share page to the directory under welcome
Merge pull request #2 from AgileVentures/feature/joinBikeShare

Feature/join bike share
Merge branch 'master' of https://github.com/AgileVentures/bubhub