updated tables in friends views
Merge branch 'debug' into dev
checking to make sure user views is the same
removed existing conflict from feature/userauthorization
Merge branch 'dev' of github.com:crwilliams87/WiFiNDR-v2 into dev
added new splash page colors
Merge branch 'dev' of github.com:crwilliams87/WiFiNDR-v2 into dev
added flash messages to user index controller
ignore DS_Store files from git and removing one
added custom map markers
Merge branch 'dev' of github.com:crwilliams87/WiFiNDR-v2 into dev
fixed root to homes#index
 brs in main home page
added icons - centered fonts