brs in main home page
Actually fixed it this time
fixed pull merge conflict
added icons - centered fonts
conflict resolved
conflict resolved
resolved another conflict
Merge branch 'dev' of github.com:crwilliams87/WiFiNDR-v2 into dev
fixed merge conflict in application stylesheet
hamlfied all the devise views