changes
Merge branch 'master' of https://github.com/tooky/otb-academy-oct-2014
Merge branch 'master' of https://github.com/tooky/otb-academy-oct-2014
Merge branch 'master' of https://github.com/tooky/otb-academy-oct-2014
Merge branch 'master' of https://github.com/tooky/otb-academy-oct-2014
filled in blanks, specs pass