before pulling from branch
removed conflicts to merge
glyphicons working!
navigation bar completed