Added Welcome controller and installed React
Fixed merge errors with sessions and gemfile.
Installed Foundation
Added upper nav bar 1.0
skeleton for react
merged
pair react model
rm wrong file name
not working
it loads on a button click
article and pair class written
merge gems
js iframe
Merge branch 'frontend_MVP'
merging
Merge branch 'master' of https://github.com/bobolinks-2014/FlipSide
merging
tried a stackoverflow should work. bug where statechange not detected)
iframe css is too thin but we can append iframe with jquery
iframe formatted correctly. bedtime
Merge pull request #10 from bobolinks-2014/frontend_MVP

Frontend mvp
fix merge conflicts