Still trying to get twitter login to work.
Merge branch 'master' of https://github.com/stevenng308/Component-Based-Term-Project
fixed the previous merge. It removed stuff that should be there. Moved the links to social media into footer so we don't have to manually add them to every page. Zack make sure you pull/merge changes before you push.