branch test
& simple
add merge
merge with no-ff
fix bug 101
merged bug fix 101
add change
merged add change
add file vulcan
merged file vulcan
merged dev 2014-09-03