Phone stuff

Some phone stuff added.
Merge branch 'master' of https://github.com/peepin/Humber_Capstone