AND simple
& simple
conflit fixed
add merge
add merge
fix bug 101
a bug 101
fix bug 101
merged bug fix 101
a bug
add feature vulcan
fix conflicted.
add pepole class