Merge pull request #5 from c410echo/master

Merge from master
Changed function
Changed file path
Changed button and function
Deleted phone
Merge pull request #70 from Hmturner/master

Summary of 10-23-14 11:14 changes