raked database
removed production from database.yml
Merge branch 'master' of github.com:crwilliams87/WiFiNDR-v2
Merge branch 'dev'
Merge branch 'dev' of github.com:crwilliams87/WiFiNDR-v2
undoing alleged typo
merged
added before_filter line to users_controller
Merge branch 'dev' of github.com:crwilliams87/WiFiNDR-v2 into dev

e enter a commit message to explain why this merge is necessary,
Merge branch 'dev' into feature/before_filter