C#/Visual Studio Midterm Assignment Ported to Java/NetBeans
Merge origin/master