Merge pull request #47 from amychiu/amy/development2

added vibration