Merge branch 'ahmadajmi-WIP' into WIP
added travis
changes to travis