added gitflow....nice nice nice
finished authentication
added bootstrap layout and nav
nice layout
Merge branch 'feature/frontEnd' into develop
used twitter bootstrap to add navigation partial, links, and home index page
* feature/frontEnd:
  nice layout
  added bootstrap layout and nav
changed application.rb to include mongomapper and template engine
added mongo.rb for phusionPassenger
deleted mongo.rb, got mixed up with mongoMapper
added feature model, basic crud ;)
replaced mongo_mapper with mongoid in generators config
added scenario model, views, controller and specs
added steps model,views, controller, specs
set up action mailer
added action mailer conf for production
Merge branch 'feature/features' into develop
trying somthing
* feature/features:
  added action mailer conf for production
  set up action mailer
  added steps model,views, controller, specs
  added scenario model, views, controller and specs
  replaced mongo_mapper with mongoid in generators config
  added feature model, basic crud ;)
  deleted mongo.rb, got mixed up with mongoMapper
  added mongo.rb for phusionPassenger
  changed application.rb to include mongomapper and template engine
deleted master branch is we areworking with gitFlow
Merge branch 'develop'

* develop:
  added action mailer conf for production
  set up action mailer
  added steps model,views, controller, specs
  added scenario model, views, controller and specs
  replaced mongo_mapper with mongoid in generators config
  added feature model, basic crud ;)
  deleted mongo.rb, got mixed up with mongoMapper
  added mongo.rb for phusionPassenger
  changed application.rb to include mongomapper and template engine
  nice layout
  added bootstrap layout and nav
  finished authentication
  added gitflow....nice nice nice

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/views/home/index.html.erb
	app/views/layouts/_navigation_links.html.erb
	app/views/layouts/application.html.erb
	config/application.rb
	config/environments/development.rb
	config/environments/production.rb
	config/routes.rb

trying to clear up master