Removed unnecessary files and rolled back db
Fixed merge conflicts
Merge branch 'master' of github.com:melissakate/time_card