Merge branch 'master' into css_stuff
Merge branch 'master' into css_stuff
styling the video tab
fixed position
small styling
tab fixes
merge
loads 4 images with some new css
Merge pull request #57 from cah13/multiple-flickr-photos

loads 4 images with some new css
Merge branch 'master' into css_stuff
centered videos
Merge branch 'master' of github.com:shawnbro/quick_shark into video_tab
css for signup page
bar graph accepts repeat words
Merge pull request #58 from rory2988/hoverbar

bar graph accepts repeat words
login page css
worked on main page styling
Merge pull request #59 from kevinmcalear/css_stuff

Css stuff
header style and expanded width of svg
Merge pull request #60 from shawnbro/stylePlayground

header style and expanded width of svg