javascript snippets change
Merge branch 'master' of github.com:littleboy85/init

Conflicts:
	vim/snippets/javascript.snippets
mac change