committing java files
Merge branch 'master' of github.com:akatigbak/TeamStack

Conflicts:
	TeamStack/TeamStack.php