first commit
adding updates
adding more updates
adding updates
updates for travis CI
adding unmerged files