Installed devise, carrierwave, and meta_search gems
Merge branch 'master' into dev
Merge pull request #1 from jageiger/dev

Gems Installed
Merge branch 'dev' of https://github.com/davenn/BAPP into dev

Conflicts:
	Gemfile.lock
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb
Cleared
Sync to Davenn
Install additional gems
Merge branch 'dev' of https://github.com/davenn/BAPP into dev
Working Devise

Got rid of meta_search and added additional params for devise.
Merge pull request #10 from jageiger/dev

Working Devise