basic setup file
Merge branch 'master' into dev
Makefile
copy paste some docs
travis yml
Update .travis.yml
Merge pull request #1 from jettify/dev

Dev