UN and PW added to users table
added body to comments
Merge branch 'master' into ody_comments

Conflicts:
	app/models/post.rb
	app/models/user.rb
Merge pull request #7 from nathanConn/ody_comments

Resolved merge issues on ody_comments.