modified Martinos information
added inc/team... was giving merge error
Merge branch 'gio' of https://github.com/HouseJunkie49/og into gio
weird insertions were added to inc/team from merge error; fixed