Initial commit
Merge branch 'release/0.5'
Merge branch 'master' of github.com:KCeejp/PeerCastYellowPages
delete .DS_Store
Merge branch 'hotfix/remove_ignore' into develop