fixed mulitple user chapter add
fixing merge
fixed a couple styling things
fixed welcome page bug
fix merge conflict
fix merge conflicts
fixed index bugs
Merge branch 'master' of github.com:HiFiveGroup/saga_app
fix merge conflicts