Initial commit
Merge branch 'master' of https://github.com/Stadium/Stadium-Android

Conflicts:
	.gitignore