Merge pull request #2 from jwm123/develop

Changed the source of the proximity value.
Reduced time collecting beacon data to 2 seconds and take an average.