Merge branch 'master' of https://github.com/Bob-Maestri/team_blah_twitter into profile_lawrence
deleted extra erb file
Merge branch 'master' of https://github.com/Bob-Maestri/team_blah_twitter into profile_lawrence
box fix
Merge pull request #28 from Bob-Maestri/boxfix

box fix
Merge pull request #29 from Bob-Maestri/Andrew

Andrew
Merge branch 'master' of https://github.com/Bob-Maestri/team_blah_twitter into profile_lawrence
Merge pull request #30 from Bob-Maestri/profile_lawrence

Profile lawrence
some minor css changes
Merge pull request #31 from Bob-Maestri/bob_css

some minor css changes
fix for logging in with duplicate name
Merge pull request #32 from Bob-Maestri/login_fix

fix for logging in with duplicate name
Reformatted left column. Mimic reformat in profile page.
Rectify merge-conflicts