changed name
fixed naming error
Merge branch 'master' of github.com:erikthiem/osuhackathon-theateam