Working on comments
Merge branch 'master' of https://github.com/youssif/bathroom_stall

Conflicts:
	app/controllers/comments_controller.rb