Updated gitignore to include node_modules
tweaks and tricks
Merge branch 'master' of https://github.com/roikles/Flexbones

Conflicts:
	functions.php