a little css, commit to pull latest pull request
Merge branch 'master' into jb
lined up buttons on edit survey page
fixed merge conflicts
fixed header
Merge branch 'master' into jb
working on edit question page
Merge pull request #58 from ryanhburbank/jb

Jb
fixed merge conflict