changed execution time from 300 -> 100ms
Merge branch 'master' of https://github.com/brandonhsiao/rgkit
updated to pass tests
increased timeout from 100ms to 150ms
Merge remote-tracking branch 'upstream/master'

Conflicts:
	render.py
black/white text and slower cursor blink