Tyrone commits some local stuff before pulling some important stuff from kyle, namely team page
Merge branch 'master' of github.com:Fishgate/OIM