fixed above-words glitch
fixing conflicts
Merge pull request #49 from Eye-Static/zach

fixed above-words glitch