First project commit.
Merge remote-tracking branch 'proximityGithub/master'