haha
haha
ah
a
Merge branch 'master' of https://github.com/meredith620/private-practise

Conflicts:
	backup/home/_emacs
	backup/home/_xinitrc