facebook mega tags
Merge branch 'visualupdates' of https://github.com/wilwong/csc309-v2 into visualupdates
conflict resloved in _head.jade