modifed travis.yml, hopefully fixed
resolve conflict
add size_t to silence compiler warning about int comparisons
remove empty line
Merge pull request #14 from kjs73/mc_compiler_warning

Mc compiler warnings due to int uint comparisons