time stamps, test updates, show page updates
Merge branch 'master' of https://github.com/dcruz112/fwitter