Create README.md
Update README.md
Update README.md
Merge branch 'dev'
conflict.
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' of github.com:storm-enroute/macrogl
Merge branch 'dev'
Merge branch 'master' of github.com:storm-enroute/macrogl
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' of github.com:storm-enroute/macrogl
Create plugins.sbt
Add .travis.yml.
Modify travis config.
Merge branch 'dev' of github.com:storm-enroute/macrogl into dev