rails 3 conventions
rails 3 conventions
Merge branch 'master' of https://github.com/jeisma/timeofftracker