Add Devise
Merge branch 'day1start' of github.com:makersquare/ativa into temp

* 'day1start' of github.com:makersquare/ativa:
  Move root route to top of routes file
Merge branch 'day1start' of github.com:makersquare/ativa into temp

* 'day1start' of github.com:makersquare/ativa:
  Fix layout and project index
Merge branch 'day1start' of github.com:makersquare/ativa into temp

* 'day1start' of github.com:makersquare/ativa:
  Move to foundation gem

Conflicts:
	Gemfile.lock
Add devise
Merge branch 'day1start' of github.com:makersquare/ativa into temp

* 'day1start' of github.com:makersquare/ativa:
  Remove more left over foundation code

Conflicts:
	Gemfile.lock
Finish up day 1
Merge branch 'day1start' of github.com:makersquare/ativa into day1end

* 'day1start' of github.com:makersquare/ativa:
  Remove more left over foundation code
  Move to foundation gem
  Fix layout and project index
  Move root route to top of routes file
  Modify seed
  Fix whitespace
  Add Pry
  Remove stock README
  removing unneeded breaks

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.haml
	app/views/projects/index.html.haml
	config/routes.rb
Merge branch 'temp' into day1end

* temp:
  Finish up day 1
  Add devise
  Add Devise

Conflicts:
	Gemfile.lock
	app/controllers/application_controller.rb
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
	config/initializers/devise.rb
	config/locales/devise.en.yml
	config/routes.rb
	db/schema.rb
Remove left over merge code
Make Post a nested resource
Merge branch 'day1start' of github.com:makersquare/ativa into day1end

* 'day1start' of github.com:makersquare/ativa:
  Make Post a nested resource
Merge branch 'day1end' of github.com:makersquare/ativa into day2start

* 'day1end' of github.com:makersquare/ativa:
  Make Post a nested resource
  Remove left over merge code
  Finish up day 1
  Add devise
  Add Devise

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/posts_controller.rb
	app/views/layouts/application.html.haml
	app/views/posts/_form.html.haml
	app/views/posts/edit.html.haml
	app/views/posts/new.html.haml
	app/views/posts/show.html.haml
	app/views/projects/index.html.haml
	app/views/projects/posts/_index.html.haml
	app/views/projects/posts/_new.html.haml
	app/views/projects/posts/_show.html.haml
	app/views/projects/show.html.haml
	config/routes.rb