fb login
resolve merge conflict
Merge remote-tracking branch 'upstream/master' into login
Merge pull request #7 from smnguyen/master

Fleshed out skeleton
fb
fix merge conflict
flesh out profile page
flesh out profile and search pages
get rid of unused files
delete more (test) files
Merge pull request #11 from rpandey1234/login

Search page and profile page fleshed out
Basic messaging layout
Merge pull request #12 from smnguyen/messaging_layout

Basic messaging layout
Styled profile with Bootstrap
Merge pull request #13 from smnguyen/bootstrap_profile

Styled profile with Bootstrap
fb login
merge conflict
facebook login work
get rid of fb dependency
Merge pull request #14 from rpandey1234/login

Facebook Login