Black Menu Bar
Silver menu bar
add begining of testing stuffs.
resolve conflict in Gemfile
fix up menu bar pre-merge
Merge branch 'new_menu'
Merge branch 'master' of https://github.com/HParker/horizon
profile pictures working near push to live.