atom
sdflkj
Merge branch 'master' of https://github.com/nickv82/dots

Conflicts:
	atom/config.cson