Committed Person2.java - Kevin Chen (kchen87)
Merge branch 'master' of https://github.com/TeamOxygen/M2