Merge branch 'JakesBranch'
Merge branch 'master' of https://github.com/GhostMonk3y/EliteSeat