Added figaro gem to segregate dev/test ID and secrets in 'config/application.yml' file; init/omniauth.rb modified to reflect this; Closes #15
moved new route and form to index
Add foundation, generate controller Welcome index, add root welcome#index, add navbar partial

Conflicts:
	Gemfile.lock
	config/routes.rb
Add iconic fonts, add basic styling to class_groups/index.html.erb

Conflicts:
	app/views/class_groups/index.html.erb
	config/routes.rb
Fix link_tag iconic-foundation.css bug
Add angularjs gem
Add foundation, generate controller Welcome index, add root welcome#index, add navbar partial

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/foundation_and_overrides.scss
	config/routes.rb
Add iconic fonts, add basic styling to class_groups/index.html.erb
Fix link_tag iconic-foundation.css bug
Add angularjs gem
fix small js bug
Run bundle and update database (in schema.rb)
memberships/index & memberships/show nested
corrected membership/edit and _form nested routes
edit & update nested paths working
membs/index.json working
nested routes in routes.rb
update controller and index of question sets for nesting
updated routes, controllers, and views for nested question set resource under class_group
created helper method for setting question set and class group in question set controller and fixed json view for route nesting