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
added name column to users
Merge branch 'dev' of github.com:crwilliams87/WiFiNDR-v2 into dev
homes page and _index partials for users and saved_networks
typo
undoing alleged typo
merged
 added validation to dev branch
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
changed _index.html.haml to show friends and requests vs all users
added user name to sign up
added buttons to views and implements homes page
fixing merge conflicts
fixed root page and updated users table