Added week four plan
added time tracking
Merge branch 'master' of https://github.com/portlandcodeschool/ruby-on-rails-2013Q3