Merge branch 'developer' of github.com:yenbryan/group-project-base into peterdev
fixed am_pm issue
Merge branch 'developer' of github.com:yenbryan/group-project-base into peterdev
merged with developer 1115
Merge pull request #14 from yenbryan/peterdev

Peterdev