Added weekend lab homework
Updated instructions
Fix sass typo
Added clarification about links
Merge branch 'master' of https://github.com/tiy-durham-2014-09/surf-and-paddle-middleman
Fixed command to set upstream repo