Merge pull request #1 from switzersc/shelby

add user model
Merge pull request #2 from switzersc/shelby

add users controller
added index file
added a date helper to the application helper
test
Revert "test"

This reverts commit 12258fee5e1fa526d910ad8f064da558c4732757.
Merge pull request #3 from switzersc/dan

added a date helper to the application helper
Merge pull request #4 from switzersc/anna

added index file
.DS_Store banished
Merge branch 'master' of https://github.com/switzersc/merge_app