Merge pull request #2 from ygenin/master

New version
fixed ff bug
merge with Logan's fix
Merge branch 'master' of https://github.com/logstown/uxteam