#1 Initial commit
#1 Merge branch 'develop'

Conflicts:
	package.json
Merge pull request #2 from itayw/master

rebase master on develop