Fix conflicts

.travis.yml

@@ -0,0 +1,9 @@
+sudo: required
+dist: trusty
+language: rust
+rust:
+  - stable
+  - beta
+  - nightly
+before_script:
+  - sudo apt-get install -qq libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsdl2-mixer-dev

Cargo.toml

@@ -4,7 +4,10 @@ description = "Rust library to create a Good Game Easily"
 version = "0.1.0"
 repository = "https://github.com/ggez-dev/ggez"
 keywords = ["ggez", "graphics", "2D"]
-authors = ["Rafael Epplee <[email protected]>", "Sven-Hendrik Haase <[email protected]>"]
+authors = [
+    "Rafael Epplee <[email protected]>",
+    "Sven-Hendrik Haase <[email protected]>"
+]
 license = "MIT"
 readme = "README.md"
 

README.md

@@ -1,4 +1,5 @@
 # ggez
+[![Build Status](https://travis-ci.org/ggez/ggez.svg?branch=master)](https://travis-ci.org/ggez/ggez) [![Docs Status](https://docs.rs/ggez/badge.svg)](https://docs.rs/ggez) [![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/svenstaro/ggez/blob/master/LICENSE) [![Crates.io](https://img.shields.io/crates/v/ggez.svg)](https://crates.io/crates/ggez) [![Crates.io](https://img.shields.io/crates/d/ggez.svg)](https://crates.io/crates/ggez)
 
 A Rust library to create a Good Game Easily.
 
@@ -11,7 +12,7 @@ basic GUI/debugger, scene manager, and more sophisticated drawing tools such as
 etc.
 
 
-# Features
+## Features
 
 * Filesystem abstraction that lets you load resources from folders or (eventually) zip files
 * Hardware-accelerated rendering of bitmaps
@@ -20,11 +21,11 @@ etc.
 * Interface for handling keyboard and mouse events
 * Config file for defining engine and game settings
 
-# Examples
+## Examples
 
 See example/imageview.rs
 
-# Status
+## Status
 
 * Still implementing sound
 * Need to make the example's resource paths work properly
@@ -36,14 +37,14 @@ See example/imageview.rs
 * Need to implement bitmap fonts and zip file loading
 * Need to add more tests, somehow
 
-# Useful goodies
+## Useful goodies
 
 * cgmath for math operations
 * specs for entity-component system
 * cgmath or vecmath for math operations?
 * physics/collision???
 
-# Credits
+## Credits
 
 * http://opengameart.org/content/flappy-dragon-sprite-sheets
 * http://opengameart.org/content/cozy-endless-game-background