ln
Merge branch 'master' of github.com:meiraka/local

Conflicts:
	apply.sh
add vimrc and vim color scheme.