made some changes :dragon_face:

Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
	app/models/user.rb
	config/routes.rb
	db/schema.rb
made more changes :banana:

Merge branch 'master' of https://github.com/adamthede/squmblr

Conflicts:
	config/routes.rb
	db/schema.rb
merged with Eliza's most up-to-date branch :hear_no_evil: