second try simplify
adding posts comments
adding files
Merge branch 'master' of https://github.com/vareshg/webi

Conflicts:
	app/controllers/application_controller.rb
	app/models/user.rb
	app/models/user.rb~
	app/views/layouts/application.html.erb
	app/views/layouts/application.html.erb~
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb