jackvial/jackvial.github.io — pull request #41 by jackvial (2014-11-12 13:39:33+00:00)
Title: Merge nav

Fixed merge conflicts in css/