Completed lab STO. Fixed design a bit
merge with johann
Merge branch 'master' of github.com:kaar/liu