edited 12/1/14
Merge branch 'master' of https://github.com/TonyVH/Learning-Java