Added Team AIXIA
Merge branch 'master' of https://github.com/koding/global.hackathon
Update team.json
Merge pull request #736 from Apt1tude/master

Team AIXIA PR