lesson 2014-09-15
Merge https://github.com/blueish4/eclipse-workspace

merge with laptop