Merge branch 'master' of github.com:icco/oneinterestingfact

Conflicts:
	.gitignore
	README.md

Author: icco

Diff for: .gitignore

@@ -1,7 +1,21 @@
+!vendor/gems/cache/
+*.gem
+*.rbc
 .DS_Store
+.bundle
+.config
+.sass-cache/*
+.yardoc
+_yardoc
+bin/*
+coverage
+doc/
+lib/bundler/man
 log/**/*
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
 tmp/**/*
-bin/*
 vendor/gems/*
-!vendor/gems/cache/
-.sass-cache/*

Diff for: README.md

@@ -1,3 +1,3 @@
-# EDIT ME.
+# one interesting fact
 
-I AM A GENERATED README.
+A simple little game.