Merge pull request #33 from pannellr/master

Updating Aboodie's branch
Merge pull request #39 from pannellr/pannellr

uppsercase Session
Merge pull request #40 from pannellr/pannellr

fixing script tags
change user class
Merge pull request #42 from pannellr/gattous

Merge pull request #33 from pannellr/master
Merge branch 'master' of https://github.com/pannellr/3132GroupProject into vivian2
add
update UI, part of marker
Merge pull request #41 from pannellr/vivian2

change user class
Merge pull request #43 from pannellr/hulance2

update UI, part of marker
Merge pull request #44 from pannellr/master

updating rickey's branch