local macbook
Merge branch 'master' of https://github.com/marmuel/ballin-spice

Conflicts:
	js/mylibs/main.js
...
...