etype/README.md

etype
=====

A typing game for Emacs.
<<<<<<< HEAD

Etype is a game written for Emacs, and is heavily inspired by
[Z-Type](http://phoboslab.org/ztype/).

##Not yet playable.
=======
>>>>>>> 1eaa79794e403f9dcbf289f403465e362e8e749c
Updated README.md to fix merge conflict. 2013-12-15 21:53:10 +00:00			`etype`
			`=====`

			`A typing game for Emacs.`
Merge branch 'master' of github.com:larstvei/etype Conflicts: README.md 2013-12-15 21:55:12 +00:00			`<<<<<<< HEAD`
Added minimal README.md. 2013-12-15 21:41:59 +00:00
			`Etype is a game written for Emacs, and is heavily inspired by`
			`[Z-Type](http://phoboslab.org/ztype/).`

			`##Not yet playable.`
Merge branch 'master' of github.com:larstvei/etype Conflicts: README.md 2013-12-15 21:55:12 +00:00			`=======`
			`>>>>>>> 1eaa79794e403f9dcbf289f403465e362e8e749c`