mousepad & terminal
Merge branch 'master' of https://github.com/grandtheftjiujitsu/DotFiles

Conflicts:
	README.md