removed rickshaw
added rickshaw back
ASDF
Merge branch 'master' of https://github.com/vicapow/vudlab-website
Merge branch 'gh-pages' of https://github.com/vicapow/vudlab-website
FIXED TITLE, TIME.