Cloud9 commit
Cloud9 commit
Moved navigation menu over from personal project to SofEng share
Created database relations/associations and added the additional fields to our Devise user edit and new pages
Cloud9 required commit
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
Just all kind of bug fixes post merge, etc.
Navbar, pre-meeting commit
HERP
f
f