Initial commit of shenanigans
woo
Merge branch 'master' of github.com:mankyKitty/emacsfiles

Conflicts:
	README.md
	init.el