Getting laptop back
Merge branch 'master' of github.com:myfashionhub/leafthru

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.md
	README.rdoc
	Rakefile
	app/assets/images/.keep
	app/assets/javascripts/application.js
	app/assets/javascripts/welcome.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/welcome.css.scss
	app/controllers/application_controller.rb
	app/controllers/articles_controller.rb
	app/controllers/concerns/.keep
	app/controllers/readers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/welcome_controller.rb
	app/helpers/application_helper.rb
	app/helpers/welcome_helper.rb
	app/mailers/.keep
	app/models/.keep
	app/models/article.rb
	app/models/concerns/.keep
	app/models/interest.rb
	app/models/reader.rb
	app/models/reader_article_join.rb
	app/models/reader_interest_join.rb
	app/views/articles/edit.html.erb
	app/views/articles/index.html.erb
	app/views/articles/new.html.erb
	app/views/articles/show.html.erb
	app/views/layouts/application.html.erb
	app/views/readers/facebook.html.erb
	app/views/readers/feed.html.erb
	app/views/readers/new.html.erb
	app/views/readers/profile.html.erb
	app/views/readers/twitter.html.erb
	app/views/sessions/_nav.html.erb
	app/views/sessions/new.html.erb
	app/views/welcome/about.html.erb
	app/views/welcome/index.html.erb
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/cookies_serializer.rb
	config/initializers/filter_parameter_logging.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/omniauth.rb
	config/initializers/session_store.rb
	config/initializers/sorcery.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	config/secrets.yml
	db/migrate/20140611194608_create_articles.rb
	db/migrate/20140612195059_create_readers.rb
	db/migrate/20140612195547_create_reader_article_joins.rb
	db/migrate/20140612201456_create_reader_interest_joins.rb
	db/migrate/20140612203356_create_interests.rb
	db/migrate/20140612215025_sorcery_core.rb
	db/migrate/20140613010739_add_location_column.rb
	db/migrate/20140613160505_add_twitter_tokens_columns.rb
	db/migrate/20140614211157_add_social_columns.rb
	db/schema.rb
	db/seeds.rb
	lib/assets/.keep
	lib/email_validator.rb
	lib/tasks/.keep
	lib/validators/email_validator.rb
	log/.keep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/robots.txt
	spec/article_spec.rb
	spec/models/interest_spec.rb
	spec/models/reader_article_join_spec.rb
	spec/models/reader_interest_join_spec.rb
	spec/models/reader_spec.rb
	spec/spec-helper.rb
	vendor/assets/javascripts/.keep
	vendor/assets/stylesheets/.keep
Paul's Monday migrate