Added travis integration and merged conflicts