Update README.rdoc

Added gemfile code to use gems
Minor bugfixes and spelling mistakes
Added logout button on users homepage
Installed bootsrap 3.2/3
d
d
Merge branch 'master' of https://github.com/ikrogers/FLATS
Merge branch 'ilya'
bugfixes
Made devise default login pages pretty
Merge branch 'master' of https://github.com/ikrogers/FLATS into clinton

Conflicts:
	.c9/metadata/tab0
	.c9/metadata/tab1
	.c9/metadata/workspace/app/views/devise/sessions/new.html.erb
	.c9/metadata/workspace/app/views/homepage/index.html.erb
	.c9/metadata/workspace/db/migrate/20141027210621_devise_create_users.rb
	.c9/metadata/workspace/db/migrate/20141029194030_create_exercise_managers.rb
	.c9/metadata/workspace/db/migrate/20141029194052_create_diet_managers.rb
	.c9/project.settings
	Gemfile.lock
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/layouts/application.html.erb
	db/migrate/20141027210621_devise_create_users.rb
	db/schema.rb
Added BMI, BMR, Age calculations to model, merged mine and Ilya's forms for editing and signing up users