Fixed directory problems
Merge branch 'master' of github.com:hbradlow/timeuser