Merge pull request #4 from kgoodwill/master

added alot of haml code to the welcome views
Added Cucumber Tests
12345
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