First Commit
Merge branch 'master' of https://github.com/pingpong-labs/admin

Conflicts:
	LICENSE
	README.md