timestamps and pseudo display
merge
Merge branch 'master' of https://github.com/RChavez/plzrespond