Updated package.json
Merge branch 'master' of github.com:objectivehtml/FlipClock

Conflicts:
	package.json