Merge branch 'master' into feature/navmenu
Merge branch 'feature/navmenu' of https://github.com/wilwong/csc309-v2 into feature/navmenu
menu items, unstable
menu units are available now
Merge branch 'master' into feature/navmenu
unstable, unfinished, updates: snail logo is present
Merge branch 'master' into feature/navmenu
updates
ignoring npm debugs
Merge branch 'master' into feature/navmenu
more nav update
create the install page
fixed blend
editor code
minor dix
one test commit
Merge branch 'daphne_backgroundimages'
Merge branch 'master' into hotfix/header
slight error fixed on one of the jade files, my fault
Merge branch 'master' of https://github.com/wilwong/csc309-v2