fixed typo
Merge branch 'master' of github.com:vashman/neon_slick
fixed typos
Merge branch 'master' of github.com:vashman/neon_slick

Conflicts:
	neon_slick/functions.php
added missing semi-colon