changed kaminari views to show 9
added footer
styled footer p
footer
fixed conflicts
Merge branch 'master' into styling_bj
took navbar out of container
more footer styling
styling users index in progress
centered divs inside container
added more pics
Merge branch 'master' into styling_bj
added google fonts
changed style sheet to scss
made navbar blue
changed logout, username
added glyphicons to assets; fixed nav pull right
Merge branch 'master' into styling
merged master onto styling