pull
pull
Merge branch 'master' of https://github.com/kneekey23/Two-Birds
pull layout
Merge branch 'master' of https://github.com/kneekey23/Two-Birds
pull layout
pull changes
Merge branch 'master' of https://github.com/kneekey23/Two-Birds
some layout and result pg changes but mostly just pulling down new code
Merge branch 'master' into sarabranch
working on page1
Merge branch 'master' of https://github.com/kneekey23/Two-Birds
Merge pull request #16 from kneekey23/meltastic

Meltastic
adding gena's input page view
Merge branch 'master' into sarabranch
Merge pull request #17 from kneekey23/sarabranch

Sarabranch
push view without javascript
push page 1 view
Merge branch 'master' of https://github.com/kneekey23/Two-Birds
push page 1 view