Skip to content

Commit

Permalink
Merge branch 'pull-request-78', Sort
Browse files Browse the repository at this point in the history
Closes #78.

Conflicts:
	.gitignore
	README.md
  • Loading branch information
James Lu authored and James Lu committed May 22, 2015
2 parents 1cdcb92 + 317440c commit 540d27b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Cargo.toml
@@ -0,0 +1,4 @@
[package]
name = "illacceptanything"
version = "0.0.1"
authors = ["Scott Cooper"]
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -115,3 +115,5 @@ Repo so big, takes forever to download
![](https://31.media.tumblr.com/tumblr_m5ldirNQ3b1qjenx9.gif)
<br>
![](http://www.gifsforum.com/images/gif/fuk%20everything/grand/fuk-everything-eccbc87e4b5ce2fe28308fd9f2a7baf3-1392.gif)

![](data/media/lemur.jpg)
Binary file added data/media/lemur.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 540d27b

Please sign in to comment.