JavaBeans
Merge branch 'master' of https://github.com/NelsonJustin/Team2-S2014-CIT360.git