added current user to resources/show, added current user over user in resources show view.
Merge pull request #9 from salamanders-2014/features

added current user to resources/show, added current user over user in re...
added format validation for email on user model
switched to postgresql from sqlite3
Merge pull request #10 from salamanders-2014/features

added format validation for email on user model
Merge pull request #11 from salamanders-2014/toPostgresql

switched to postgresql from sqlite3
secrets revealed
fuck you merge Merge branch 'master' of https://github.com/salamanders-2014/share-dbc
deleted secrets
Merge pull request #12 from salamanders-2014/new-links

deleted secrets
added test to user model
Merge pull request #13 from salamanders-2014/new-user-tests

added test to user model
did stuff with config/secrets
Merge pull request #14 from salamanders-2014/maybe-config-will-work

did stuff with config/secrets
added tests for resources and subjects
Merge pull request #15 from salamanders-2014/addTestsForResources

added tests for resources and subjects
fixed typo in resource spec
Merge pull request #16 from salamanders-2014/fix-test-typo

fixed typo in resource spec
fixed merge conflicts