New project
Merge branch 'master' of https://github.com/bordeux/GeekShare

Conflicts:
	README.md
Merge https://github.com/bordeux/GeekShare

Conflicts:
	README.md