Updating work to home
Merge branch 'master' of https://github.com/jjrr1984/NGAblog

Conflicts:
	app/controllers/comments_controller.rb