Merge branch 'master' into img_fix
nav bar colors really really fixed
Merge branch 'master' into nav_bar_color_fix
Merge pull request #64 from purple-martins-2013/nav_bar_color_fix

Nav bar color fix