Use Menlo in Atom
This is going to get annoying
use .md instead
atom
Merge remote-tracking branch 'upstream/master'

Conflicts:
	atom.symlink/config.cson