Added replies and supercomments to Comment model
removing .idea files from repo, causing problems with ruby mine
Updating and making tests
Merge branch 'master' of https://github.com/dazm12/blog_engine
Added author/user to post view
Merge branch 'master' into janice_style

Conflicts:
	app/views/posts/show.html.erb
A little styling to capture the latest changes on master