timer controller and model
relationship between user and timer
Factory Girl
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
resolved merge conflict