ajax

	modified:   Gemfile
	new file:   app/assets/images/bg.png
	modified:   app/assets/stylesheets/application.css
	modified:   app/controllers/comments_controller.rb
	modified:   app/controllers/posts_controller.rb
	new file:   app/views/comments/_comment.html.erb
	modified:   app/views/comments/_form.html.erb
	new file:   app/views/comments/create.js.erb
	modified:   app/views/devise/registrations/new.html.erb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/posts/_comments.html.erb
	modified:   app/views/posts/index.html.erb
	modified:   app/views/posts/show.html.erb
	modified:   app/views/users/index.html.erb
	modified:   app/views/users/show.html.erb
Merge branch 'master' of github.com:nazgul92/test

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/comments_controller.rb
	app/views/comments/_comment.html.erb
	app/views/comments/_form.html.erb
	app/views/comments/create.js.erb
	app/views/layouts/application.html.erb
	app/views/posts/_comments.html.erb
	app/views/posts/show.html.erb