adding JGI
merge with Logan's fix
Merge branch 'master' of https://github.com/logstown/uxteam
Merge pull request #3 from ygenin/master

adding JGI