changed comment partial, added comment partials to posts - user id error persists
fixed a local merge conflict
timer controller and model
relationship between user and timer
Factory Girl
comment boxes now working
squashed resource bug
fixed conflict
facebook login buttons
Merge pull request #36 from kunovsky/timer

Timer
Merge pull request #37 from kunovsky/facebook_css_and_tests

facebook login buttons
fixed the Rspec tests for Posts
Fixed user can post in Rspec
Merge pull request #38 from kunovsky/fix_post_contoller_tests

Fix post contoller tests
fixed comment link to show the user who created the comment
changed routes to edit, update, destroy posts
added destroy functionality for posts
stylized destroy location
resolved merge conflict
Merge pull request #40 from kunovsky/edit-delete-posts

Edit delete posts