yenbryan/group-project-base — pull request #34 by chuckcwh (2014-10-31 06:15:45+00:00)
Title: Chuckdev

solve conflict