Make exercise 7 and 8 of lab 3 optional.. or they won't make it in time :(
Merging 'master' into 'gh-pages'