added files
Merge commit 'origin/master~3'

Conflicts:
	init.el
Merge commit 'origin/master~2'

Conflicts:
	init.el
merge
Merge remote-tracking branch 'origin/master'