local changes
Merge branch 'mau_devise' of https://github.com/railsbeauty/billi into mau_devise
t

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/articles_controller.rb
	app/views/layouts/application.html.erb
	db/schema.rb
resolved conflicts
coflict resovle
local changes
added comment's user functionality