added scrolling and some ui design
fixed merge conflict with logIn.jsp twitter links
Merge pull request #19 from GoogleJump/JustinsBranch

added scrolling and some ui design