Merge pull request #1 from prudentbot/tyler

Tyler
Merge branch 'master' of https://github.com/prudentbot/fightapp