Added modal css & layout changes; fixed conflict
Merge branch 'master' of github.com:Dsan10s/TASharePrototype