trying to pull master
Merge branch 'master' of https://github.com/cprater/dev_boot_face into add_comment_to_post

Conflicts:
	config/routes.rb
adds commets to a particular post
Merge branch 'master' of https://github.com/cprater/dev_boot_face into add_comment_to_post
Merge pull request #16 from cprater/add_comment_to_post

Add comment to post