daw
Merge branch 'test' of https://github.com/predocs2014/course into test
Merge branch 'joran' of https://github.com/predocs2014/course into joran