Merge pull request #48 from amychiu/amy/development2

added info tab