worked on the navbar hilighting
updated the hilighting on the navbar
Merge pull request #5 from daveinthecave/master

Cucumber Step_Definitions
Merge pull request #6 from kgoodwill/master

hilighting for navbar
removed some old controller files
did a little styling on the welcome views
How It works haml page
Merge pull request #7 from wkowalczyk/master

How It works haml page
added link for the how it works page
Updated seeds.rb to populate user database with dummy data
Merge pull request #8 from AgileVentures/chore/database_seeds

Updated seeds.rb to populate user database with dummy data
Added cucumber test for Join BikeShare page and updated web_steps to include a method that checks for images.
added some styling
Merge branch 'master' of http://github.com/AgileVentures/bubhub
Merge pull request #10 from AgileVentures/test/joinBikeShare

Cucumber test for Join BikeShare page
added cucumber tests for index_page
Merge branch 'master' of http://github.com/AgileVentures/bubhub
Trying to Fix resources.html.haml merge